[ARVADOS] updated: 2.1.0-2166-ga07868985

[Git user]

Summary of changes:
 sdk/go/httpserver/logger.go | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

       via  a078689858a5ef45abe5309f0972fe3d18ea3fc3 (commit)
      from  8f0f3b495d0c715cc57d0d384bc5839acf9ece3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a078689858a5ef45abe5309f0972fe3d18ea3fc3
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Mar 28 10:14:09 2022 -0400

    18896: review feedback, un-pyramid the logrus.Fields update.
    
    XXXXX:
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/sdk/go/httpserver/logger.go b/sdk/go/httpserver/logger.go
index ef2ec4170..00e31478d 100644
--- a/sdk/go/httpserver/logger.go
+++ b/sdk/go/httpserver/logger.go
@@ -68,18 +68,15 @@ func HandlerWithDeadline(timeout time.Duration, next http.Handler) http.Handler
 }
 
 func SetResponseLogFields(ctx context.Context, fields logrus.Fields) {
-	m := ctx.Value(&mutexContextKey)
-	if mutex, ok := m.(sync.Mutex); ok {
-		mutex.Lock()
-		defer mutex.Unlock()
-		ctxfields := ctx.Value(&responseLogFieldsContextKey)
-		if c, ok := ctxfields.(logrus.Fields); ok {
-			for k, v := range fields {
-				c[k] = v
-			}
-		}
-	} else {
-		// We can't lock, don't set the fields
+	m, _ := ctx.Value(&mutexContextKey).(sync.Mutex)
+	c, _ := ctx.Value(&responseLogFieldsContextKey).(logrus.Fields)
+	if m == nil || c == nil {
+		return
+	}
+	m.Lock()
+	defer m.Unlock()
+	for k, v := range fields {
+		c[k] = v
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--