fix(tls/redis): tls keys misconception + redis condition
This commit is contained in:
parent
307a9692fd
commit
9bf77a6a8e
|
|
@ -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,6 +176,7 @@ func main() {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if *redisAddr != "" {
|
||||||
err = server.AddHook(new(redis.Hook), &redis.Options{
|
err = server.AddHook(new(redis.Hook), &redis.Options{
|
||||||
Options: &rv8.Options{
|
Options: &rv8.Options{
|
||||||
Addr: *redisAddr, // default redis address
|
Addr: *redisAddr, // default redis address
|
||||||
|
|
@ -186,6 +187,7 @@ func main() {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
err := server.Serve()
|
err := server.Serve()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user