Merge branch 'release-4.7' into rm-willnorris-proxy-support

6 files changed, 14 insertions, 135 deletions

diff --git a/cmd/platform/channel.go b/cmd/platform/channel.go
index 5d86ad9da..98bdcebb8 100644
--- a/cmd/platform/channel.go
+++ b/cmd/platform/channel.go
@@ -106,8 +106,6 @@ func init() {
 	channelCreateCmd.Flags().String("purpose", "", "Channel purpose")
 	channelCreateCmd.Flags().Bool("private", false, "Create a private channel.")
 
-	moveChannelsCmd.Flags().String("username", "", "Required. Username who is moving the channel.")
-
 	deleteChannelsCmd.Flags().Bool("confirm", false, "Confirm you really want to delete the channels.")
 
 	modifyChannelCmd.Flags().Bool("private", false, "Convert the channel to a private channel")
@@ -321,33 +319,26 @@ func moveChannelsCmdF(cmd *cobra.Command, args []string) error {
 		return errors.New("Unable to find destination team '" + args[0] + "'")
 	}
 
-	username, erru := cmd.Flags().GetString("username")
-	if erru != nil || username == "" {
-		return errors.New("Username is required")
-	}
-	user := getUserFromUserArg(a, username)
-
 	channels := getChannelsFromChannelArgs(a, args[1:])
 	for i, channel := range channels {
 		if channel == nil {
 			CommandPrintErrorln("Unable to find channel '" + args[i] + "'")
 			continue
 		}
-		originTeamID := channel.TeamId
-		if err := moveChannel(a, team, channel, user); err != nil {
+		if err := moveChannel(a, team, channel); err != nil {
 			CommandPrintErrorln("Unable to move channel '" + channel.Name + "' error: " + err.Error())
 		} else {
-			CommandPrettyPrintln("Moved channel '" + channel.Name + "' to " + team.Name + "(" + team.Id + ") from " + originTeamID + ".")
+			CommandPrettyPrintln("Moved channel '" + channel.Name + "'")
 		}
 	}
 
 	return nil
 }
 
-func moveChannel(a *app.App, team *model.Team, channel *model.Channel, user *model.User) *model.AppError {
+func moveChannel(a *app.App, team *model.Team, channel *model.Channel) *model.AppError {
 	oldTeamId := channel.TeamId
 
-	if err := a.MoveChannel(team, channel, user); err != nil {
+	if err := a.MoveChannel(team, channel); err != nil {
 		return err
 	}
 
diff --git a/cmd/platform/channel_test.go b/cmd/platform/channel_test.go
index cf8603cf3..1e6915679 100644
--- a/cmd/platform/channel_test.go
+++ b/cmd/platform/channel_test.go
@@ -44,33 +44,6 @@ func TestRemoveChannel(t *testing.T) {
 	checkCommand(t, "channel", "remove", th.BasicTeam.Name+":"+channel.Name, th.BasicUser2.Email)
 }
 
-func TestMoveChannel(t *testing.T) {
-	th := api.Setup().InitBasic()
-	defer th.TearDown()
-
-	client := th.BasicClient
-	team1 := th.BasicTeam
-	team2 := th.CreateTeam(client)
-	user1 := th.BasicUser
-	th.LinkUserToTeam(user1, team2)
-	channel := th.BasicChannel
-
-	th.LinkUserToTeam(user1, team1)
-	th.LinkUserToTeam(user1, team2)
-
-	adminEmail := user1.Email
-	adminUsername := user1.Username
-	origin := team1.Name + ":" + channel.Name
-	dest := team2.Name
-
-	checkCommand(t, "channel", "add", origin, adminEmail)
-
-	// should fail with nill because errors are logged instead of returned when a channel does not exist
-	require.Nil(t, runCommand(t, "channel", "move", dest, team1.Name+":doesnotexist", "--username", adminUsername))
-
-	checkCommand(t, "channel", "move", dest, origin, "--username", adminUsername)
-}
-
 func TestListChannels(t *testing.T) {
 	th := api.Setup().InitBasic()
 	defer th.TearDown()
diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go
index 044ee6b6a..e664136c0 100644
--- a/cmd/platform/jobserver.go
+++ b/cmd/platform/jobserver.go
@@ -35,7 +35,7 @@ func jobserverCmdF(cmd *cobra.Command, args []string) {
 	defer l4g.Close()
 	defer a.Shutdown()
 
-	a.LoadLicense()
+	a.Jobs.LoadLicense()
 
 	// Run jobs
 	l4g.Info("Starting Mattermost job server")
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 1b411cf20..e3742cef6 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -42,11 +42,10 @@ func runServerCmd(cmd *cobra.Command, args []string) error {
 
 	disableConfigWatch, _ := cmd.Flags().GetBool("disableconfigwatch")
 
-	interruptChan := make(chan os.Signal, 1)
-	return runServer(config, disableConfigWatch, interruptChan)
+	return runServer(config, disableConfigWatch)
 }
 
-func runServer(configFileLocation string, disableConfigWatch bool, interruptChan chan os.Signal) error {
+func runServer(configFileLocation string, disableConfigWatch bool) error {
 	options := []app.Option{app.ConfigFile(configFileLocation)}
 	if disableConfigWatch {
 		options = append(options, app.DisableConfigWatch)
@@ -54,7 +53,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan
 
 	a, err := app.New(options...)
 	if err != nil {
-		l4g.Critical(err.Error())
+		l4g.Error(err.Error())
 		return err
 	}
 	defer a.Shutdown()
@@ -88,12 +87,7 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan
 		}
 	})
 
-	serverErr := a.StartServer()
-	if serverErr != nil {
-		l4g.Critical(serverErr.Error())
-		return serverErr
-	}
-
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api3 := api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)
@@ -166,8 +160,9 @@ func runServer(configFileLocation string, disableConfigWatch bool, interruptChan
 
 	// wait for kill signal before attempting to gracefully shutdown
 	// the running service
-	signal.Notify(interruptChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
-	<-interruptChan
+	c := make(chan os.Signal, 1)
+	signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+	<-c
 
 	if a.Cluster != nil {
 		a.Cluster.StopInterNodeCommunication()
diff --git a/cmd/platform/server_test.go b/cmd/platform/server_test.go
deleted file mode 100644
index 15f9a357a..000000000
--- a/cmd/platform/server_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"syscall"
-	"testing"
-
-	"github.com/mattermost/mattermost-server/jobs"
-	"github.com/mattermost/mattermost-server/utils"
-	"github.com/stretchr/testify/require"
-)
-
-type ServerTestHelper struct {
-	configPath         string
-	disableConfigWatch bool
-	interruptChan      chan os.Signal
-	originalInterval   int
-}
-
-func SetupServerTest() *ServerTestHelper {
-	// Build a channel that will be used by the server to receive system signals…
-	interruptChan := make(chan os.Signal, 1)
-	// …and sent it immediately a SIGINT value.
-	// This will make the server loop stop as soon as it started successfully.
-	interruptChan <- syscall.SIGINT
-
-	// Let jobs poll for termination every 0.2s (instead of every 15s by default)
-	// Otherwise we would have to wait the whole polling duration before the test
-	// terminates.
-	originalInterval := jobs.DEFAULT_WATCHER_POLLING_INTERVAL
-	jobs.DEFAULT_WATCHER_POLLING_INTERVAL = 200
-
-	th := &ServerTestHelper{
-		configPath:         utils.FindConfigFile("config.json"),
-		disableConfigWatch: true,
-		interruptChan:      interruptChan,
-		originalInterval:   originalInterval,
-	}
-	return th
-}
-
-func (th *ServerTestHelper) TearDownServerTest() {
-	jobs.DEFAULT_WATCHER_POLLING_INTERVAL = th.originalInterval
-}
-
-func TestRunServerSuccess(t *testing.T) {
-	th := SetupServerTest()
-	defer th.TearDownServerTest()
-
-	err := runServer(th.configPath, th.disableConfigWatch, th.interruptChan)
-	require.NoError(t, err)
-}
-
-func TestRunServerInvalidConfigFile(t *testing.T) {
-	th := SetupServerTest()
-	defer th.TearDownServerTest()
-
-	// Start the server with an unreadable config file
-	unreadableConfigFile, err := ioutil.TempFile("", "mattermost-unreadable-config-file-")
-	if err != nil {
-		panic(err)
-	}
-	os.Chmod(unreadableConfigFile.Name(), 0200)
-	defer os.Remove(unreadableConfigFile.Name())
-
-	err = runServer(unreadableConfigFile.Name(), th.disableConfigWatch, th.interruptChan)
-	require.Error(t, err)
-}
diff --git a/cmd/platform/test.go b/cmd/platform/test.go
index 9ab3fbb36..036df07de 100644
--- a/cmd/platform/test.go
+++ b/cmd/platform/test.go
@@ -53,11 +53,7 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error {
 	defer a.Shutdown()
 
 	utils.InitTranslations(a.Config().LocalizationSettings)
-	serverErr := a.StartServer()
-	if serverErr != nil {
-		return serverErr
-	}
-
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)
@@ -75,11 +71,7 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error {
 	defer a.Shutdown()
 
 	utils.InitTranslations(a.Config().LocalizationSettings)
-	serverErr := a.StartServer()
-	if serverErr != nil {
-		return serverErr
-	}
-
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)