浏览代码

chore: let logx.SetWriter can be called anytime (#2186)

Kevin Wan 2 年之前
父节点
当前提交
9b334b5428
共有 3 个文件被更改,包括 5 次插入8 次删除
  1. 1 4
      core/logx/logs.go
  2. 3 2
      core/logx/logs_test.go
  3. 1 2
      zrpc/internal/serverinterceptors/statinterceptor.go

+ 1 - 4
core/logx/logs.go

@@ -199,11 +199,8 @@ func SetLevel(level uint32) {
 }
 
 // SetWriter sets the logging writer. It can be used to customize the logging.
-// Call Reset before calling SetWriter again.
 func SetWriter(w Writer) {
-	if writer.Load() == nil {
-		writer.Store(w)
-	}
+	writer.Store(w)
 }
 
 // SetUp sets up the logx. If already set up, just return nil.

+ 3 - 2
core/logx/logs_test.go

@@ -603,8 +603,9 @@ func TestSetWriter(t *testing.T) {
 	SetWriter(nopWriter{})
 	assert.NotNil(t, writer.Load())
 	assert.True(t, writer.Load() == nopWriter{})
-	SetWriter(new(mockWriter))
-	assert.True(t, writer.Load() == nopWriter{})
+	mocked := new(mockWriter)
+	SetWriter(mocked)
+	assert.Equal(t, mocked, writer.Load())
 }
 
 func TestWithGzip(t *testing.T) {

+ 1 - 2
zrpc/internal/serverinterceptors/statinterceptor.go

@@ -69,8 +69,7 @@ func logDuration(ctx context.Context, method string, req interface{}, duration t
 		if err != nil {
 			logx.WithContext(ctx).Errorf("%s - %s", addr, err.Error())
 		} else if duration > slowThreshold.Load() {
-			logger.Slowf("[RPC] slowcall - %s - %s - %s",
-				addr, method, string(content))
+			logger.Slowf("[RPC] slowcall - %s - %s - %s", addr, method, string(content))
 		} else {
 			logger.Infof("%s - %s - %s", addr, method, string(content))
 		}