lttech
/
caddy-env-redis-loader
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.6.2' into main

main
naicoi 2023-06-25 01:37:19 +07:00
parent 6e7bff4565 9e2c6d9186
commit 19452e286a
Signed by: naicoi
GPG Key ID: 7142E472DF7CF7D9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,6 +1,6 @@
FROM caddy:builder-alpine AS builder
RUN xcaddy build v2.6.4 \
#--with github.com/techio-dev/caddy-redis@v1.6.0 \
--with github.com/techio-dev/caddy-redis@v1.6.2 \
--with github.com/caddy-dns/cloudflare \
--with github.com/caddy-dns/digitalocean \
--with github.com/caddy-dns/porkbun \

8
envredisloader.go
View File

@ -18,7 +18,7 @@ import (
"os"
"github.com/caddyserver/caddy/v2"
"github.com/go-redis/redis"
goredis "github.com/go-redis/redis/v8"
)
func init() {
@ -40,13 +40,13 @@ func (ENVRedisLoader) CaddyModule() caddy.ModuleInfo {
func (ENVRedisLoader) LoadConfig(ctx caddy.Context) ([]byte, error) {
ClientName := os.Getenv("NAME")
redisOpts, err := redis.ParseURL(os.Getenv("REDIS_URL"))
redisOpts, err := goredis.ParseURL(os.Getenv("REDIS_URL"))
if err != nil {
return nil, err
}
rdb := redis.NewClient(redisOpts)
rdb := goredis.NewClient(redisOpts)
defer rdb.Close()
val, err := rdb.Get("caddy:config:" + ClientName).Bytes()
val, err := rdb.Get(ctx, "caddy:config:"+ClientName).Bytes()
if err != nil {
return nil, err
}