Fix the log issue.

Signed-off-by: Ye Cao <[email protected]>
v6d-io · Feb 19, 2024 · c85cca3 · c85cca3
1 parent e5e0a97
commit c85cca3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/tutorials/data-processing/accelerate-data-sharing-in-kedro.rst b/docs/tutorials/data-processing/accelerate-data-sharing-in-kedro.rst
@@ -23,7 +23,7 @@ To deploy Kedro pipelines on Kubernetes, you must have a kubernetes cluster.
     If you already have a K8s cluster, just skip this section and continue
     on deploying.
 
-We recommend `kind v0.10.0 <https://kind.sigs.k8s.io/>`_ to create a multi-node
+We recommend `kind v0.13.0 <https://kind.sigs.k8s.io/>`_ to create a multi-node
 Kubernetes cluster on your local machine as follows:
 
 .. code:: bash

diff --git a/go/vineyard/pkg/common/log/log.go b/go/vineyard/pkg/common/log/log.go
@@ -92,8 +92,12 @@ func SetLogger(l Logger) {
 func FromContext(ctx context.Context, keysAndValues ...any) Logger {
 	log := Log.Logger
 	if ctx != nil {
-		log = logr.FromContext(ctx)
+		logWithCtx := logr.FromContext(ctx)
+		if logWithCtx != nil {
+			log = logWithCtx
+		}
 	}
+
 	return Logger{log.WithValues(keysAndValues...)}
 }
 

diff --git a/k8s/pkg/log/log.go b/k8s/pkg/log/log.go
@@ -92,7 +92,10 @@ func SetLogger(l Logger) {
 func FromContext(ctx context.Context, keysAndValues ...any) Logger {
 	log := Log.Logger
 	if ctx != nil {
-		log = logr.FromContext(ctx)
+		logWithCtx := logr.FromContext(ctx)
+		if logWithCtx != nil {
+			log = logWithCtx
+		}
 	}
 	return Logger{log.WithValues(keysAndValues...)}
 }