diff --git a/pkg/common/config/parse.go b/pkg/common/config/parse.go index 06b11a6a5..e216f6014 100644 --- a/pkg/common/config/parse.go +++ b/pkg/common/config/parse.go @@ -100,7 +100,8 @@ func initConfig(config any, configName, configFolderPath string) error { if !os.IsNotExist(err) { return errs.Wrap(err, fmt.Sprintf("failed to check existence of config file at path: %s", configFilePath)) } - projectRoot, err := GetProjectRoot() + var projectRoot string + projectRoot, err = GetProjectRoot() if err != nil { return err } diff --git a/pkg/common/db/cache/user.go b/pkg/common/db/cache/user.go index 416825770..f444a2c46 100644 --- a/pkg/common/db/cache/user.go +++ b/pkg/common/db/cache/user.go @@ -277,8 +277,8 @@ func (u *UserCacheRedis) refreshStatusOffline(ctx context.Context, userID string func (u *UserCacheRedis) refreshStatusOnline(ctx context.Context, userID string, platformID int32, isNil bool, err error, result, key string) error { var onlineStatus user.OnlineStatus if !isNil { - err := json.Unmarshal([]byte(result), &onlineStatus) - if err != nil { + err2 := json.Unmarshal([]byte(result), &onlineStatus) + if err2 != nil { return errs.Wrap(err, "json.Unmarshal failed") } onlineStatus.PlatformIDs = RemoveRepeatedElementsInList(append(onlineStatus.PlatformIDs, platformID)) @@ -289,7 +289,7 @@ func (u *UserCacheRedis) refreshStatusOnline(ctx context.Context, userID string, onlineStatus.UserID = userID newjsonData, err := json.Marshal(&onlineStatus) if err != nil { - return errs.Wrap(err) + return errs.Wrap(err, "json.Marshal failed") } _, err = u.rdb.HSet(ctx, key, userID, string(newjsonData)).Result() if err != nil {