Преглед изворни кода

daemon/logger: use strings.Cut()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn пре 2 година
родитељ
комит
ad7f1a8dcc
2 измењених фајлова са 4 додато и 4 уклоњено
  1. 2 2
      daemon/logger/journald/internal/sdjournal/sdjournal.go
  2. 2 2
      daemon/logger/loginfo.go

+ 2 - 2
daemon/logger/journald/internal/sdjournal/sdjournal.go

@@ -234,8 +234,8 @@ func (j *Journal) Data() (map[string]string, error) {
 			return m, fmt.Errorf("journald: error enumerating entry data: %w", syscall.Errno(-rc))
 			return m, fmt.Errorf("journald: error enumerating entry data: %w", syscall.Errno(-rc))
 		}
 		}
 
 
-		kv := strings.SplitN(C.GoStringN((*C.char)(data), C.int(len)), "=", 2)
-		m[kv[0]] = kv[1]
+		k, v, _ := strings.Cut(C.GoStringN((*C.char)(data), C.int(len)), "=")
+		m[k] = v
 	}
 	}
 }
 }
 
 

+ 2 - 2
daemon/logger/loginfo.go

@@ -59,8 +59,8 @@ func (info *Info) ExtraAttributes(keyMod func(string) string) (map[string]string
 
 
 	envMapping := make(map[string]string)
 	envMapping := make(map[string]string)
 	for _, e := range info.ContainerEnv {
 	for _, e := range info.ContainerEnv {
-		if kv := strings.SplitN(e, "=", 2); len(kv) == 2 {
-			envMapping[kv[0]] = kv[1]
+		if k, v, ok := strings.Cut(e, "="); ok {
+			envMapping[k] = v
 		}
 		}
 	}
 	}