diff --git a/modules/backup/redis/redis.go b/modules/backup/redis/redis.go index cae0ac3..f07e8bf 100755 --- a/modules/backup/redis/redis.go +++ b/modules/backup/redis/redis.go @@ -143,7 +143,7 @@ func (j *job) DoBackup(logCh chan logger.LogRecord, tmpDir string) error { var errs *multierror.Error for ofsPart, tgt := range j.targets { - tmpBackupFile := misc.GetFileFullPath(tmpDir, ofsPart, "tar", "", tgt.gzip) + tmpBackupFile := misc.GetFileFullPath(tmpDir, ofsPart, "rdb", "", tgt.gzip) err := os.MkdirAll(path.Dir(tmpBackupFile), os.ModePerm) if err != nil { logCh <- logger.Log(j.name, "").Errorf("Unable to create tmp dir with next error: %s", err) @@ -173,12 +173,10 @@ func (j *job) DoBackup(logCh chan logger.LogRecord, tmpDir string) error { return errs.ErrorOrNil() } -func (j *job) createTmpBackup(logCh chan logger.LogRecord, tmpDir, tgtName string, tgt target) error { +func (j *job) createTmpBackup(logCh chan logger.LogRecord, tmpBackupFile, tgtName string, tgt target) error { var stderr, stdout bytes.Buffer - tmpBackupFile := misc.GetFileFullPath(tmpDir, tgtName, "rdb", "", tgt.gzip) - tmpBackupRdb := strings.TrimSuffix(tmpBackupFile, ".gz") var args []string diff --git a/modules/connectors/redis_connect/redis_connect.go b/modules/connectors/redis_connect/redis_connect.go index 903dc8e..aa72769 100644 --- a/modules/connectors/redis_connect/redis_connect.go +++ b/modules/connectors/redis_connect/redis_connect.go @@ -20,8 +20,6 @@ func GetConnectAndDSN(params Params) (rdb *redis.Client, dsn string, err error) connUrl := url.URL{} opts := url.Values{} - connUrl.User = url.UserPassword("", params.Passwd) - if params.Socket != "" { connUrl.Scheme = "unix" connUrl.Path = params.Socket @@ -49,7 +47,9 @@ func GetConnectAndDSN(params Params) (rdb *redis.Client, dsn string, err error) err = rdb.Ping(context.Background()).Err() // this is not a bug, this is strange behavior of redis-cli uri usage - connUrl.User = url.User(params.Passwd) + if params.Passwd != "" { + connUrl.User = url.User(params.Passwd) + } dsn = connUrl.String() return