From e5a60d294bb856fafe88918d3328fbafab8a4675 Mon Sep 17 00:00:00 2001 From: Florimond Husquinet Date: Sat, 16 Dec 2023 11:14:09 +0100 Subject: [PATCH 1/3] Bump appveyor go version to 1.20 (#415) --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6c2d788e..82a5b665 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,8 +13,8 @@ environment: install: - set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - rmdir c:\go /s /q - - appveyor DownloadFile https://storage.googleapis.com/golang/go1.16.windows-amd64.zip - - 7z x go1.16.windows-amd64.zip -y -oC:\ > NUL + - appveyor DownloadFile https://storage.googleapis.com/golang/go1.20.windows-amd64.zip + - 7z x go1.20.windows-amd64.zip -y -oC:\ > NUL - go version build_script: From 8d839e076ff2bb3b0579b9e67af7f80265eee5c7 Mon Sep 17 00:00:00 2001 From: Florimond Husquinet Date: Sun, 17 Dec 2023 20:06:56 +0100 Subject: [PATCH 2/3] Bump appveyor go version to 1.20 and remove deprecated -i flag (#416) --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.bat b/build.bat index 7ab06502..16d71320 100644 --- a/build.bat +++ b/build.bat @@ -12,5 +12,5 @@ goto :end set GOARCH=%2 go tool dist install pkg/runtime go install -a std - go build -o build/emitter-%1-%2%3 -i -ldflags "-X github.com/emitter-io/emitter/internal/command/version.version=%APPVEYOR_BUILD_VERSION% -X github.com/emitter-io/emitter/internal/command/version.commit=%APPVEYOR_REPO_COMMIT%" . + go build -o build/emitter-%1-%2%3 -ldflags "-X github.com/emitter-io/emitter/internal/command/version.version=%APPVEYOR_BUILD_VERSION% -X github.com/emitter-io/emitter/internal/command/version.commit=%APPVEYOR_REPO_COMMIT%" . :end \ No newline at end of file From 374de747de2a0266b785c0017ef9b57e393ecad4 Mon Sep 17 00:00:00 2001 From: Florimond Husquinet Date: Mon, 18 Dec 2023 20:41:55 +0100 Subject: [PATCH 3/3] Quick fix: memory provider selection (#417) --- internal/broker/service.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/broker/service.go b/internal/broker/service.go index 53d7c46b..0367f52b 100644 --- a/internal/broker/service.go +++ b/internal/broker/service.go @@ -156,7 +156,11 @@ func NewService(ctx context.Context, cfg *config.Config) (s *Service, err error) s.surveyor = survey.New(s.pubsub, s.cluster) s.presence = presence.New(s, s.pubsub, s.surveyor, s.subscriptions) if s.cluster != nil { - s.surveyor.HandleFunc(s.presence, ssdstore, memstore) + if s.storage.Name() == ssdstore.Name() { + s.surveyor.HandleFunc(s.presence, ssdstore) + } else if s.storage.Name() == memstore.Name() { + s.surveyor.HandleFunc(s.presence, memstore) + } } // Create a new cipher from the licence provided