Merge remote-tracking branch 'origin/errcode' into errcode

pkg/common/db/controller/msg.go

@@ -483,6 +483,9 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 			break
 		}
 	}
+	if len(seqs) == 0 {
+		return 0, 0, nil, nil
+	}
 	newBegin := seqs[0]
 	newEnd := seqs[len(seqs)-1]
 	log.ZDebug(ctx, "GetMsgBySeqsRange", "first seqs", seqs, "newBegin", newBegin, "newEnd", newEnd)
@@ -519,7 +522,7 @@ func (db *commonMsgDatabase) GetMsgBySeqsRange(ctx context.Context, userID strin
 	}
 	log.ZDebug(ctx, "get msgs from cache", "successMsgs", successMsgs)
 	if len(failedSeqs) != 0 {
-		log.ZDebug(ctx, "msgs not exist in redis", err, "seqs", failedSeqs)
+		log.ZDebug(ctx, "msgs not exist in redis", "seqs", failedSeqs)
 	}
 	// get from cache or db
 	prome.Add(prome.MsgPullFromRedisSuccessCounter, len(successMsgs))

pkg/common/log/zap.go

@@ -2,7 +2,6 @@ package log
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -119,14 +118,14 @@ func (l *ZapLogger) cores(isStdout bool, isJson bool, logLocation string, rotate
 		return nil, err
 	}
 	var cores []zapcore.Core
+	// if logLocation == "" && !isStdout {
+	// 	return nil, errors.New("log storage location is empty and not stdout")
+	// }
 	if logLocation != "" {
 		cores = []zapcore.Core{
 			zapcore.NewCore(fileEncoder, writer, zap.NewAtomicLevelAt(l.level)),
 		}
 	}
-	if logLocation == "" && !isStdout {
-		return nil, errors.New("log storage location is empty and not stdout")
-	}
 	if isStdout {
 		cores = append(cores, zapcore.NewCore(fileEncoder, zapcore.Lock(os.Stdout), zap.NewAtomicLevelAt(l.level)))
 		// cores = append(cores, zapcore.NewCore(fileEncoder, zapcore.Lock(os.Stderr), zap.NewAtomicLevelAt(l.level)))