Fix merge regressions after jetstream parity merge

This commit is contained in:
Joseph Doherty
2026-02-23 08:56:15 -05:00
parent a8985ecb1a
commit 3fea2da2cf
3 changed files with 2 additions and 15 deletions

View File

@@ -138,7 +138,6 @@ public sealed class VarzHandler : IDisposable
Consumers = _server.JetStreamConsumers, Consumers = _server.JetStreamConsumers,
}, },
}, },
Mqtt = BuildMqttVarz(),
}; };
} }
finally finally

View File

@@ -2,14 +2,14 @@ namespace NATS.Server.Protocol;
public sealed class ClientCommandMatrix public sealed class ClientCommandMatrix
{ {
public bool IsAllowed(ClientKind kind, string? op) public bool IsAllowed(global::NATS.Server.ClientKind kind, string? op)
{ {
if (string.IsNullOrWhiteSpace(op)) if (string.IsNullOrWhiteSpace(op))
return true; return true;
return (kind, op.ToUpperInvariant()) switch return (kind, op.ToUpperInvariant()) switch
{ {
(ClientKind.Router, "RS+") => true, (global::NATS.Server.ClientKind.Router, "RS+") => true,
(_, "RS+") => false, (_, "RS+") => false,
_ => true, _ => true,
}; };

View File

@@ -1,12 +0,0 @@
namespace NATS.Server.Protocol;
public enum ClientKind
{
Client,
Router,
Gateway,
Leaf,
System,
JetStream,
Account,
}