From 9bf77a6a8eaef364a0adb9f7907a56c30ed556d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leandro=20Ant=C3=B4nio=20Farias=20Machado?= Date: Thu, 18 May 2023 01:10:16 -0300 Subject: [PATCH] fix(tls/redis): tls keys misconception + redis condition --- backend/services/mochi/cmd/main.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/backend/services/mochi/cmd/main.go b/backend/services/mochi/cmd/main.go index 0f3594f..909008a 100644 --- a/backend/services/mochi/cmd/main.go +++ b/backend/services/mochi/cmd/main.go @@ -8,6 +8,8 @@ import ( "bytes" "crypto/tls" "flag" + rv8 "github.com/go-redis/redis/v8" + "github.com/mochi-co/mqtt/v2/hooks/storage/redis" "github.com/mochi-co/mqtt/v2/packets" "github.com/rs/zerolog" "io/ioutil" @@ -17,10 +19,8 @@ import ( "strings" "syscall" - rv8 "github.com/go-redis/redis/v8" "github.com/mochi-co/mqtt/v2" "github.com/mochi-co/mqtt/v2/hooks/auth" - "github.com/mochi-co/mqtt/v2/hooks/storage/redis" "github.com/mochi-co/mqtt/v2/listeners" ) @@ -115,12 +115,12 @@ func main() { log.Fatal(err) } - priv, err := ioutil.ReadFile(*fullchain) + pv, err := ioutil.ReadFile(*privkey) if err != nil { log.Fatal(err) } - cert, err := tls.X509KeyPair(chain, priv) + cert, err := tls.X509KeyPair(chain, pv) if err != nil { log.Fatal(err) } @@ -176,15 +176,17 @@ func main() { log.Fatal(err) } - err = server.AddHook(new(redis.Hook), &redis.Options{ - Options: &rv8.Options{ - Addr: *redisAddr, // default redis address - Password: "", // your password - DB: 0, // your redis db - }, - }) - if err != nil { - log.Fatal(err) + if *redisAddr != "" { + err = server.AddHook(new(redis.Hook), &redis.Options{ + Options: &rv8.Options{ + Addr: *redisAddr, // default redis address + Password: "", // your password + DB: 0, // your redis db + }, + }) + if err != nil { + log.Fatal(err) + } } go func() {