Fix merge regressions after jetstream parity merge
This commit is contained in:
@@ -138,7 +138,6 @@ public sealed class VarzHandler : IDisposable
|
|||||||
Consumers = _server.JetStreamConsumers,
|
Consumers = _server.JetStreamConsumers,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Mqtt = BuildMqttVarz(),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
|
|||||||
@@ -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,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
namespace NATS.Server.Protocol;
|
|
||||||
|
|
||||||
public enum ClientKind
|
|
||||||
{
|
|
||||||
Client,
|
|
||||||
Router,
|
|
||||||
Gateway,
|
|
||||||
Leaf,
|
|
||||||
System,
|
|
||||||
JetStream,
|
|
||||||
Account,
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user