rogee/go-sip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Normalize MQ and tenant routing code names

Browse Source
This commit is contained in:
rogee
2026-09-30 11:42:44 +08:00
parent 8e21007e6b
commit 1a7e4f4dec
17 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/sip-go-agent/current_dispatcher_command.go
+1 -1
View File
@@ -90,7 +90,7 @@ func runCurrentDispatcher(ctx context.Context, mode string) (result error) {
if err := database.CloseAdmission(settings.DispatcherID); err != nil {
return fmt.Errorf("close task admission before connecting external adapters: %w", err)
}
broker, err := mq.OpenCurrent(settings.RabbitMQURL, settings.DispatcherID, 1)
broker, err := mq.Open(settings.RabbitMQURL, settings.DispatcherID, 1)
if err != nil {
return err
}
cmd/sip-go-agent/current_dispatcher_integration_test.go
+4 -4
View File
@@ -48,16 +48,16 @@ func TestCurrentDispatcherCommandStartsWithIsolatedMQHTTPAndAgent(t *testing.T)
t.Fatal(err)
}
defer admin.Close()
for _, exchange := range []string{mq.CommandsExchangeCurrent, mq.ResultsExchangeCurrent, mq.DeadLetterExchangeCurrent} {
for _, exchange := range []string{mq.CommandsExchange, mq.ResultsExchange, mq.DeadLetterExchange} {
if err := admin.ExchangeDeclare(exchange, "topic", true, false, false, false, nil); err != nil {
t.Fatal(err)
}
}
control, err := tenant.CurrentControlRoute(dispatcherID)
control, err := tenant.ControlRoute(dispatcherID)
if err != nil {
t.Fatal(err)
}
result, err := tenant.CurrentResultRoute(dispatcherID)
result, err := tenant.ResultRoute(dispatcherID)
if err != nil {
t.Fatal(err)
}
@@ -76,7 +76,7 @@ func TestCurrentDispatcherCommandStartsWithIsolatedMQHTTPAndAgent(t *testing.T)
t.Fatal(err)
}
defer func() { _ = admin.QueueUnbind(result.Queue, result.BindingKey, result.Exchange, nil) }()
taskRoute, err := tenant.CurrentTaskRoute(dispatcherID, "task-asr")
taskRoute, err := tenant.TaskRoute(dispatcherID, "task-asr")
if err != nil {
t.Fatal(err)
}