move queue flag

livekit · Mar 9, 2024 · 3fd2738 · 3fd2738
1 parent 4258373
commit 3fd2738
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/info/channels.go b/pkg/info/channels.go
@@ -121,14 +121,14 @@ func formatServerWildcard(service string, topic []string, queue bool) string {
 
 func appendServerPrefix(b []byte, service string, topic []string, queue bool) []byte {
 	b = append(b, "SRV/"...)
-	if queue {
-		b = append(b, "Q/"...)
-	}
 	b = append(b, service...)
 	if len(topic) > 0 {
 		b = append(b, '/')
 		b = appendChannelParts(b, '/', topic...)
 	}
+	if queue {
+		b = append(b, "/Q"...)
+	}
 	b = append(b, '.')
 	return b
 }

diff --git a/pkg/info/channels_test.go b/pkg/info/channels_test.go
@@ -64,11 +64,11 @@ func TestChannelFormatters(t *testing.T) {
 	i.Queue = true
 
 	require.Equal(t, "foo|bar|a|b|c|REQ", i.GetRPCChannel().Legacy)
-	require.Equal(t, "SRV/Q/foo/a/b/c.bar.REQ", i.GetRPCChannel().Primary)
-	require.Equal(t, "SRV/Q/foo/a/b/c.*.*", i.GetRPCChannel().Wildcard)
+	require.Equal(t, "SRV/foo/a/b/c/Q.bar.REQ", i.GetRPCChannel().Primary)
+	require.Equal(t, "SRV/foo/a/b/c/Q.*.*", i.GetRPCChannel().Wildcard)
 	require.Equal(t, "foo|bar|a|b|c|RCLAIM", i.GetClaimResponseChannel().Legacy)
-	require.Equal(t, "SRV/Q/foo/a/b/c.bar.RCLAIM", i.GetClaimResponseChannel().Primary)
-	require.Equal(t, "SRV/Q/foo/a/b/c.*.*", i.GetClaimResponseChannel().Wildcard)
+	require.Equal(t, "SRV/foo/a/b/c/Q.bar.RCLAIM", i.GetClaimResponseChannel().Primary)
+	require.Equal(t, "SRV/foo/a/b/c/Q.*.*", i.GetClaimResponseChannel().Wildcard)
 	require.Equal(t, "foo|bar|a|b|c|STR", i.GetStreamServerChannel().Legacy)
 	require.Equal(t, "SRV/foo/a/b/c.bar.STR", i.GetStreamServerChannel().Primary)
 	require.Equal(t, "SRV/foo/a/b/c.*.*", i.GetStreamServerChannel().Wildcard)