From ab50fa155b9975308abfbc4138ccd37e06180c76 Mon Sep 17 00:00:00 2001 From: John Tzikas Date: Wed, 11 Nov 2020 16:09:30 +0200 Subject: [PATCH] Remove unused argument on runServer (#16237) --- cmd/mattermost/commands/server.go | 4 ++-- cmd/mattermost/commands/server_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/mattermost/commands/server.go b/cmd/mattermost/commands/server.go index 9d5f6e39db..b59130ed3b 100644 --- a/cmd/mattermost/commands/server.go +++ b/cmd/mattermost/commands/server.go @@ -48,10 +48,10 @@ func serverCmdF(command *cobra.Command, args []string) error { return errors.Wrap(err, "failed to load configuration") } - return runServer(configStore, disableConfigWatch, usedPlatform, interruptChan) + return runServer(configStore, usedPlatform, interruptChan) } -func runServer(configStore *config.Store, disableConfigWatch bool, usedPlatform bool, interruptChan chan os.Signal) error { +func runServer(configStore *config.Store, usedPlatform bool, interruptChan chan os.Signal) error { // Setting the highest traceback level from the code. // This is done to print goroutines from all threads (see golang.org/issue/13161) // and also preserve a crash dump for later investigation. diff --git a/cmd/mattermost/commands/server_test.go b/cmd/mattermost/commands/server_test.go index 368f5ca36a..684e356dda 100644 --- a/cmd/mattermost/commands/server_test.go +++ b/cmd/mattermost/commands/server_test.go @@ -62,7 +62,7 @@ func TestRunServerSuccess(t *testing.T) { // Use non-default listening port in case another server instance is already running. *configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort - err := runServer(configStore, th.disableConfigWatch, false, th.interruptChan) + err := runServer(configStore, false, th.interruptChan) require.NoError(t, err) } @@ -113,7 +113,7 @@ func TestRunServerSystemdNotification(t *testing.T) { *configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort // Start and stop the server - err = runServer(configStore, th.disableConfigWatch, false, th.interruptChan) + err = runServer(configStore, false, th.interruptChan) require.NoError(t, err) // Ensure the notification has been sent on the socket and is correct @@ -135,6 +135,6 @@ func TestRunServerNoSystemd(t *testing.T) { // Use non-default listening port in case another server instance is already running. *configStore.Get().ServiceSettings.ListenAddress = UnitTestListeningPort - err := runServer(configStore, th.disableConfigWatch, false, th.interruptChan) + err := runServer(configStore, false, th.interruptChan) require.NoError(t, err) }