From a06d8b0ca609c2554991eb7018bccbd0422d8699 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Mon, 12 Aug 2024 21:53:26 +0200 Subject: [PATCH] renamed converge package to matchmaker. --- cmd/converge/converge.go | 8 ++++---- cmd/converge/convergeaccess.go | 4 ++-- pkg/server/{converge => matchmaker}/matchmaker.go | 2 +- pkg/server/{converge => matchmaker}/notifier.go | 2 +- pkg/server/{converge => matchmaker}/websessions.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename pkg/server/{converge => matchmaker}/matchmaker.go (99%) rename pkg/server/{converge => matchmaker}/notifier.go (84%) rename pkg/server/{converge => matchmaker}/websessions.go (99%) diff --git a/cmd/converge/converge.go b/cmd/converge/converge.go index 8ffc575..0f91a4f 100644 --- a/cmd/converge/converge.go +++ b/cmd/converge/converge.go @@ -3,7 +3,7 @@ package main import ( "context" "fmt" - "git.wamblee.org/converge/pkg/server/converge" + "git.wamblee.org/converge/pkg/server/matchmaker" "git.wamblee.org/converge/pkg/support/websocketutil" "log" "net" @@ -96,8 +96,8 @@ func main() { } notifications := NewStateNotifier() - admin := converge.NewMatchMaker(notifications) - websessions := converge.NewWebSessions(notifications.webNotificationChannel) + admin := matchmaker.NewMatchMaker(notifications) + websessions := matchmaker.NewWebSessions(notifications.webNotificationChannel) // For agents connecting registrationService := websocketutil.WebSocketService{ @@ -138,7 +138,7 @@ func main() { ctx, cancel := context.WithCancel(context.Background()) websession := websessions.NewSession(conn, ctx) defer websessions.SessionClosed(websession) - location, err := converge.GetUserLocation(r) + location, err := matchmaker.GetUserLocation(r) if err != nil { panic(err) } diff --git a/cmd/converge/convergeaccess.go b/cmd/converge/convergeaccess.go index 5105f71..966281d 100644 --- a/cmd/converge/convergeaccess.go +++ b/cmd/converge/convergeaccess.go @@ -2,7 +2,7 @@ package main import ( "git.wamblee.org/converge/pkg/models" - "git.wamblee.org/converge/pkg/server/converge" + "git.wamblee.org/converge/pkg/server/matchmaker" "net/http" "regexp" "strings" @@ -32,7 +32,7 @@ func getConvergeAccess(r *http.Request) models.ConvergeAccess { } } - location, err := converge.GetUserLocation(r) + location, err := matchmaker.GetUserLocation(r) if err != nil { panic(err) } diff --git a/pkg/server/converge/matchmaker.go b/pkg/server/matchmaker/matchmaker.go similarity index 99% rename from pkg/server/converge/matchmaker.go rename to pkg/server/matchmaker/matchmaker.go index d8561fb..39a82e0 100644 --- a/pkg/server/converge/matchmaker.go +++ b/pkg/server/matchmaker/matchmaker.go @@ -1,4 +1,4 @@ -package converge +package matchmaker import ( "fmt" diff --git a/pkg/server/converge/notifier.go b/pkg/server/matchmaker/notifier.go similarity index 84% rename from pkg/server/converge/notifier.go rename to pkg/server/matchmaker/notifier.go index f82ac60..a63a396 100644 --- a/pkg/server/converge/notifier.go +++ b/pkg/server/matchmaker/notifier.go @@ -1,4 +1,4 @@ -package converge +package matchmaker import "git.wamblee.org/converge/pkg/models" diff --git a/pkg/server/converge/websessions.go b/pkg/server/matchmaker/websessions.go similarity index 99% rename from pkg/server/converge/websessions.go rename to pkg/server/matchmaker/websessions.go index 4c02328..6ee1428 100644 --- a/pkg/server/converge/websessions.go +++ b/pkg/server/matchmaker/websessions.go @@ -1,4 +1,4 @@ -package converge +package matchmaker import ( "context"