Merge pull request #47 from leandrofars/dev

v1.0.1
This commit is contained in:
Leandro Antônio Farias Machado 2023-05-18 01:11:40 -03:00 committed by GitHub
commit e639d79654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions

View File

@ -3,3 +3,4 @@ cmd/mqtt
*.db *.db
auth.prod.json auth.prod.json
run.prod.sh run.prod.sh
mochi

View File

@ -8,6 +8,8 @@ import (
"bytes" "bytes"
"crypto/tls" "crypto/tls"
"flag" "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/mochi-co/mqtt/v2/packets"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"io/ioutil" "io/ioutil"
@ -17,10 +19,8 @@ import (
"strings" "strings"
"syscall" "syscall"
rv8 "github.com/go-redis/redis/v8"
"github.com/mochi-co/mqtt/v2" "github.com/mochi-co/mqtt/v2"
"github.com/mochi-co/mqtt/v2/hooks/auth" "github.com/mochi-co/mqtt/v2/hooks/auth"
"github.com/mochi-co/mqtt/v2/hooks/storage/redis"
"github.com/mochi-co/mqtt/v2/listeners" "github.com/mochi-co/mqtt/v2/listeners"
) )
@ -115,12 +115,12 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
priv, err := ioutil.ReadFile(*fullchain) pv, err := ioutil.ReadFile(*privkey)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
cert, err := tls.X509KeyPair(chain, priv) cert, err := tls.X509KeyPair(chain, pv)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -176,15 +176,17 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
err = server.AddHook(new(redis.Hook), &redis.Options{ if *redisAddr != "" {
Options: &rv8.Options{ err = server.AddHook(new(redis.Hook), &redis.Options{
Addr: *redisAddr, // default redis address Options: &rv8.Options{
Password: "", // your password Addr: *redisAddr, // default redis address
DB: 0, // your redis db Password: "", // your password
}, DB: 0, // your redis db
}) },
if err != nil { })
log.Fatal(err) if err != nil {
log.Fatal(err)
}
} }
go func() { go func() {