X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8a504ad561c1ffbafee8a7bc8da551f9d4b9a29e..0662b235357dd40b5d27efd06b60044ddcec06f6:/services/datamanager/loggerutil/loggerutil.go

diff --git a/services/datamanager/loggerutil/loggerutil.go b/services/datamanager/loggerutil/loggerutil.go
index 1514922396..8c655cd5ff 100644
--- a/services/datamanager/loggerutil/loggerutil.go
+++ b/services/datamanager/loggerutil/loggerutil.go
@@ -16,8 +16,8 @@ func LogRunInfo(arvLogger *logger.Logger) {
 	if arvLogger != nil {
 		now := time.Now()
 		arvLogger.Update(func(p map[string]interface{}, e map[string]interface{}) {
-			runInfo := make(map[string]interface{})
-			runInfo["time_started"] = now
+			runInfo := logger.GetOrCreateMap(p, "run_info")
+			runInfo["started_at"] = now
 			runInfo["args"] = os.Args
 			hostname, err := os.Hostname()
 			if err != nil {
@@ -26,26 +26,25 @@ func LogRunInfo(arvLogger *logger.Logger) {
 				runInfo["hostname"] = hostname
 			}
 			runInfo["pid"] = os.Getpid()
-			p["run_info"] = runInfo
 		})
 	}
 }
 
 // A LogMutator that records the current memory usage. This is most useful as a logger write hook.
-//
-// Assumes we already have a map named "run_info" in properties. LogRunInfo() can create such a map for you if you call it.
 func LogMemoryAlloc(p map[string]interface{}, e map[string]interface{}) {
-	runInfo := p["run_info"].(map[string]interface{})
+	runInfo := logger.GetOrCreateMap(p, "run_info")
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)
-	runInfo["alloc_bytes_in_use"] = memStats.Alloc
+	runInfo["memory_bytes_in_use"] = memStats.Alloc
+	runInfo["memory_bytes_reserved"] = memStats.Sys
 }
 
 func FatalWithMessage(arvLogger *logger.Logger, message string) {
 	if arvLogger != nil {
 		arvLogger.FinalUpdate(func(p map[string]interface{}, e map[string]interface{}) {
 			p["FATAL"] = message
-			p["run_info"].(map[string]interface{})["time_finished"] = time.Now()
+			runInfo := logger.GetOrCreateMap(p, "run_info")
+			runInfo["finished_at"] = time.Now()
 		})
 	}