Merge pull request #13 from soldiermoth/allow-message-key

Allow 'message' to be used as the message key instead of 'msg'
humanlogio · Jun 16, 2017 · d83d791 · d83d791
2 parents cda9ae1 + bdda93f
commit d83d791
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/json_handler.go b/json_handler.go
@@ -82,8 +82,11 @@ func (h *JSONHandler) UnmarshalJSON(data []byte) error {
 		h.Time = time.Unix(int64(f), int64((f-float64(int64(f)))*1000000000))
 		delete(raw, "ts")
 	}
-	h.Message, _ = raw["msg"].(string)
-	delete(raw, "msg")
+	if h.Message, ok = raw["msg"].(string); ok {
+		delete(raw, "msg")
+	} else if h.Message, ok = raw["message"].(string); ok {
+		delete(raw, "message")
+	}
 
 	h.Level, ok = raw["level"].(string)
 	if !ok {