From 501da809f3ec77725bdbf3f78ba43ef723ef6b98 Mon Sep 17 00:00:00 2001
From: Daniel Schalla <daniel@schalla.me>
Date: Mon, 4 Nov 2019 19:03:59 +0100
Subject: [PATCH] [CR-458] Enhance Logs Endpoint Message (#12984)

* Make it possible to identify log entries created via the post API endpoints

* Clarify wording
---
 api4/system.go      | 14 ++++++++------
 api4/system_test.go |  7 +++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/api4/system.go b/api4/system.go
index 6e3a8866b5..8e192bb382 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -262,14 +262,16 @@ func postLog(c *Context, w http.ResponseWriter, r *http.Request) {
 		msg = msg[0:399]
 	}
 
+	msg = "Client Logs API Endpoint Message: " + msg
+	fields := []mlog.Field{
+		mlog.String("type", "client_message"),
+		mlog.String("user_agent", c.App.UserAgent),
+	}
+
 	if !forceToDebug && lvl == "ERROR" {
-		err := &model.AppError{}
-		err.Message = msg
-		err.Id = msg
-		err.Where = "client"
-		c.LogError(err)
+		mlog.Error(msg, fields...)
 	} else {
-		mlog.Debug("message", mlog.String("message", msg))
+		mlog.Debug(msg, fields...)
 	}
 
 	m["message"] = msg
diff --git a/api4/system_test.go b/api4/system_test.go
index 0d5985d69b..6d887b8abe 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -283,6 +283,13 @@ func TestPostLog(t *testing.T) {
 	_, resp := Client.PostLog(message)
 	CheckNoError(t, resp)
 
+	*th.App.Config().ServiceSettings.EnableDeveloper = false
+
+	_, resp = Client.PostLog(message)
+	CheckNoError(t, resp)
+
+	*th.App.Config().ServiceSettings.EnableDeveloper = true
+
 	Client.Logout()
 
 	_, resp = Client.PostLog(message)