Cleanup usage of global logger (#26835)

server/cmd/mattermost/commands/jobserver.go

@@ -46,8 +46,8 @@ func jobserverCmdF(command *cobra.Command, args []string) error {
 	rctx := request.EmptyContext(a.Log())
 
 	// Run jobs
-	a.Log().Info("Starting Mattermost job server")
-	defer a.Log().Info("Stopped Mattermost job server")
+	rctx.Logger().Info("Starting Mattermost job server")
+	defer rctx.Logger().Info("Stopped Mattermost job server")
 
 	if !noJobs {
 		a.Srv().Jobs.StartWorkers()
@@ -68,7 +68,7 @@ func jobserverCmdF(command *cobra.Command, args []string) error {
 	<-signalChan
 
 	// Cleanup anything that isn't handled by a defer statement
-	a.Log().Info("Stopping Mattermost job server")
+	rctx.Logger().Info("Stopping Mattermost job server")
 
 	return nil
 }

server/cmd/mmctl/commands/plugin_marketplace_e2e_test.go

@@ -17,7 +17,7 @@ func (s *MmctlE2ETestSuite) TestPluginMarketplaceInstallCmd() {
 	s.RunForSystemAdminAndLocal("install a plugin", func(c client.Client) {
 		printer.Clean()
 
-		marketPlacePlugins, appErr := s.th.App.GetMarketplacePlugins(&model.MarketplacePluginFilter{
+		marketPlacePlugins, appErr := s.th.App.GetMarketplacePlugins(s.th.Context, &model.MarketplacePluginFilter{
 			Page:    0,
 			PerPage: 100,
 			Filter:  "jira",