lingling
/
tiny-rdm
mirror of https://github.com/tiny-craft/tiny-rdm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pref: compatible with IPv6 address

This commit is contained in:
Lykin 2024-09-06 15:08:53 +08:00
parent eaa68df583
commit a70b5b56ff
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/browser_service.go
View File

@ -301,8 +301,8 @@ func (b *browserService) createRedisClient(ctx context.Context, selConn types.Co
return return
} }
// get a redis client from local cache or create a new open // get a redis client from local cache or create a new one
// if db >= 0, will also switch to db index // if db >= 0, it will also switch to target database index
func (b *browserService) getRedisClient(server string, db int) (item *connectionItem, err error) { func (b *browserService) getRedisClient(server string, db int) (item *connectionItem, err error) {
b.mutex.Lock() b.mutex.Lock()
defer b.mutex.Unlock() defer b.mutex.Unlock()

13
backend/services/connection_service.go
View File

@ -5,7 +5,6 @@ import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"errors" "errors"
"fmt"
"github.com/klauspost/compress/zip" "github.com/klauspost/compress/zip"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"github.com/vrischmann/userdir" "github.com/vrischmann/userdir"
@ -65,7 +64,7 @@ func (c *connectionService) buildOption(config types.ConnectionConfig) (*redis.O
} else if config.Proxy.Type == 2 { } else if config.Proxy.Type == 2 {
// use custom proxy // use custom proxy
proxyUrl := url.URL{ proxyUrl := url.URL{
Host: fmt.Sprintf("%s:%d", config.Proxy.Addr, config.Proxy.Port), Host: net.JoinHostPort(config.Proxy.Addr, strconv.Itoa(config.Proxy.Port)),
} }
if len(config.Proxy.Username) > 0 { if len(config.Proxy.Username) > 0 {
proxyUrl.User = url.UserPassword(config.Proxy.Username, config.Proxy.Password) proxyUrl.User = url.UserPassword(config.Proxy.Username, config.Proxy.Password)
@ -111,7 +110,7 @@ func (c *connectionService) buildOption(config types.ConnectionConfig) (*redis.O
return nil, errors.New("invalid login type") return nil, errors.New("invalid login type")
} }
sshAddr = fmt.Sprintf("%s:%d", config.SSH.Addr, config.SSH.Port) sshAddr = net.JoinHostPort(config.SSH.Addr, strconv.Itoa(config.SSH.Port))
} }
var tlsConfig *tls.Config var tlsConfig *tls.Config
@ -168,9 +167,9 @@ func (c *connectionService) buildOption(config types.ConnectionConfig) (*redis.O
port = config.Port port = config.Port
} }
if len(config.Addr) <= 0 { if len(config.Addr) <= 0 {
option.Addr = fmt.Sprintf("127.0.0.1:%d", port) option.Addr = net.JoinHostPort("127.0.0.1", strconv.Itoa(port))
} else { } else {
option.Addr = fmt.Sprintf("%s:%d", config.Addr, port) option.Addr = net.JoinHostPort(config.Addr, strconv.Itoa(port))
} }
} }
@ -224,7 +223,7 @@ func (c *connectionService) createRedisClient(config types.ConnectionConfig) (re
if len(addr) < 2 { if len(addr) < 2 {
return nil, errors.New("cannot get master address") return nil, errors.New("cannot get master address")
} }
option.Addr = fmt.Sprintf("%s:%s", addr[0], addr[1]) option.Addr = net.JoinHostPort(addr[0], addr[1])
option.Username = config.Sentinel.Username option.Username = config.Sentinel.Username
option.Password = config.Sentinel.Password option.Password = config.Sentinel.Password
} }
@ -310,7 +309,7 @@ func (c *connectionService) ListSentinelMasters(config types.ConnectionConfig) (
if infoMap, ok := info.(map[any]any); ok { if infoMap, ok := info.(map[any]any); ok {
retInfo = append(retInfo, map[string]string{ retInfo = append(retInfo, map[string]string{
"name": infoMap["name"].(string), "name": infoMap["name"].(string),
"addr": fmt.Sprintf("%s:%s", infoMap["ip"].(string), infoMap["port"].(string)), "addr": net.JoinHostPort(infoMap["ip"].(string), infoMap["port"].(string)),
}) })
} }
} }