(dubbo-go-pixiu) branch develop updated: fix: Correct logger hotreload logic (#682)

[alexstocks]

This is an automated email from the ASF dual-hosted git repository.

alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git


The following commit(s) were added to refs/heads/develop by this push:
     new d825492c fix: Correct logger hotreload logic (#682)
d825492c is described below

commit d825492c9895590eb53eb36f2c8a559f510bc11b
Author: Alan <m134679102365...@163.com>
AuthorDate: Sat May 31 21:40:21 2025 +0800

    fix: Correct logger hotreload logic (#682)
    
    * fix: correct logger configuration reload logic in logger.go
    
    * fix import
    
    ---------
    
    Co-authored-by: Xuetao Li <xueta...@bit.edu.cn>
---
 pkg/hotreload/logger.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkg/hotreload/logger.go b/pkg/hotreload/logger.go
index eb2a024f..6bc00424 100644
--- a/pkg/hotreload/logger.go
+++ b/pkg/hotreload/logger.go
@@ -17,6 +17,10 @@
 
 package hotreload
 
+import (
+       "go.uber.org/zap"
+)
+
 import (
        "github.com/apache/dubbo-go-pixiu/pkg/logger"
        "github.com/apache/dubbo-go-pixiu/pkg/model"
@@ -30,12 +34,12 @@ func (r *LoggerReloader) CheckUpdate(oldConfig, newConfig 
*model.Bootstrap) bool
        oc := oldConfig.Log
        nc := newConfig.Log
 
-       if oc == nil && nc != nil {
+       if nc == nil && oc != nil {
                return true
-       }
-
-       if oc != nil && nc == nil {
+       } else if nc == nil && oc == nil {
                return false
+       } else if nc != nil && oc == nil {
+               return true
        }
 
        // Check if any logger configuration fields have changed.
@@ -67,7 +71,11 @@ func (r *LoggerReloader) CheckUpdate(oldConfig, newConfig 
*model.Bootstrap) bool
 
 // HotReload applies the new logger configuration.
 func (r *LoggerReloader) HotReload(oldConfig, newConfig *model.Bootstrap) 
error {
-       if err := logger.HotReload(newConfig.Log.Build()); err != nil {
+       var newConfBuild *zap.Config
+       if newConfig.Log != nil {
+               newConfBuild = newConfig.Log.Build()
+       }
+       if err := logger.HotReload(newConfBuild); err != nil {
                logger.Errorf("Failed to reload logger configuration: %v", err)
                return err
        }