From 61f08d397c379d7565712255f90b8fe3562018f0 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Tue, 29 Sep 2020 14:30:15 +0100
Subject: [PATCH] MM-28419: Move SetLogger() to Server. (#15551)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
---
 app/app.go                           |  5 -----
 app/app_iface.go                     |  2 --
 app/opentracing/opentracing_layer.go | 15 ---------------
 app/server.go                        |  4 ++++
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/app.go b/app/app.go
index 90602570dd..dc94fd14fc 100644
--- a/app/app.go
+++ b/app/app.go
@@ -677,8 +677,3 @@ func (a *App) SetServer(srv *Server) {
 func (a *App) GetT() goi18n.TranslateFunc {
 	return a.t
 }
-
-// TODO: change this to make a server method.
-func (a *App) SetLog(l *mlog.Logger) {
-	a.srv.Log = l
-}
diff --git a/app/app_iface.go b/app/app_iface.go
index 97ae79e4b9..c2d0f96370 100644
--- a/app/app_iface.go
+++ b/app/app_iface.go
@@ -296,8 +296,6 @@ type AppIface interface {
 	// the member's group memberships and the configuration of those groups to the syncable. This method should only
 	// be invoked on group-synced (aka group-constrained) syncables.
 	SyncSyncableRoles(syncableID string, syncableType model.GroupSyncableType) *model.AppError
-	// TODO: change this to make a server method.
-	SetLog(l *mlog.Logger)
 	// TeamMembersMinusGroupMembers returns the set of users on the given team minus the set of users in the given
 	// groups.
 	//
diff --git a/app/opentracing/opentracing_layer.go b/app/opentracing/opentracing_layer.go
index 0ccde03b14..6f7a2a199b 100644
--- a/app/opentracing/opentracing_layer.go
+++ b/app/opentracing/opentracing_layer.go
@@ -13289,21 +13289,6 @@ func (a *OpenTracingAppLayer) SetDefaultProfileImage(user *model.User) *model.Ap
 	return resultVar0
 }
 
-func (a *OpenTracingAppLayer) SetLog(l *mlog.Logger) {
-	origCtx := a.ctx
-	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SetLog")
-
-	a.ctx = newCtx
-	a.app.Srv().Store.SetContext(newCtx)
-	defer func() {
-		a.app.Srv().Store.SetContext(origCtx)
-		a.ctx = origCtx
-	}()
-
-	defer span.Finish()
-	a.app.SetLog(l)
-}
-
 func (a *OpenTracingAppLayer) SetPhase2PermissionsMigrationStatus(isComplete bool) error {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SetPhase2PermissionsMigrationStatus")
diff --git a/app/server.go b/app/server.go
index ce3f5fecee..ab76f4922a 100644
--- a/app/server.go
+++ b/app/server.go
@@ -1538,3 +1538,7 @@ func (s *Server) TelemetryId() string {
 func (s *Server) HttpService() httpservice.HTTPService {
 	return s.HTTPService
 }
+
+func (s *Server) SetLog(l *mlog.Logger) {
+	s.Log = l
+}