From 0331409488083a58d66fdf58eb22cbaa924237f6 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 1 Aug 2017 05:53:42 -0700
Subject: Add jobserver command to platform binary (#7067)

* Add jobserver command to platform binary

* Fixing jobserver config. Adding jobserver flags.

* Fixing govet in makefile
---
 jobs/jobserver/jobserver.go | 45 ---------------------------------------------
 jobs/server.go              |  8 ++------
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 jobs/jobserver/jobserver.go

(limited to 'jobs')

diff --git a/jobs/jobserver/jobserver.go b/jobs/jobserver/jobserver.go
deleted file mode 100644
index aabe5d3b2..000000000
--- a/jobs/jobserver/jobserver.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package main
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/jobs"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
-
-	_ "github.com/mattermost/platform/imports"
-)
-
-func main() {
-	// Initialize
-	utils.InitAndLoadConfig("config.json")
-	defer l4g.Close()
-
-	jobs.Srv.Store = store.NewLayeredStore()
-	defer jobs.Srv.Store.Close()
-
-	jobs.Srv.LoadLicense()
-
-	// Run jobs
-	l4g.Info("Starting Mattermost job server")
-	jobs.Srv.StartWorkers()
-	jobs.Srv.StartSchedulers()
-
-	var signalChan chan os.Signal = make(chan os.Signal)
-	signal.Notify(signalChan, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
-	<-signalChan
-
-	// Cleanup anything that isn't handled by a defer statement
-	l4g.Info("Stopping Mattermost job server")
-
-	jobs.Srv.StopSchedulers()
-	jobs.Srv.StopWorkers()
-
-	l4g.Info("Stopped Mattermost job server")
-}
diff --git a/jobs/server.go b/jobs/server.go
index 7920cb2d5..58412a40e 100644
--- a/jobs/server.go
+++ b/jobs/server.go
@@ -49,15 +49,11 @@ func (server *JobServer) LoadLicense() {
 }
 
 func (server *JobServer) StartWorkers() {
-	if *utils.Cfg.JobSettings.RunJobs {
-		Srv.Workers = InitWorkers().Start()
-	}
+	Srv.Workers = InitWorkers().Start()
 }
 
 func (server *JobServer) StartSchedulers() {
-	if *utils.Cfg.JobSettings.RunJobs {
-		Srv.Schedulers = InitSchedulers().Start()
-	}
+	Srv.Schedulers = InitSchedulers().Start()
 }
 
 func (server *JobServer) StopWorkers() {
-- 
cgit v1.2.3-1-g7c22