Merge pull request #3324 from semaphoreui/syslog

syslog

Author: fiftin

cli/cmd/root.go

@@ -2,13 +2,15 @@ package cmd
 
 import (
 	"fmt"
+	"log/syslog"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 
 	"github.com/semaphoreui/semaphore/api/helpers"
 	"github.com/semaphoreui/semaphore/services/server"
+	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
 
 	"github.com/gorilla/handlers"
 	"github.com/semaphoreui/semaphore/api"
@@ -71,8 +73,22 @@ func Execute() {
 	}
 }
 
+func initSyslog(conf *util.SyslogConfig) {
+	if conf.Enabled {
+		hook, err := lSyslog.NewSyslogHook(conf.Network, conf.Address, syslog.LOG_DEBUG, conf.Tag)
+		if err == nil {
+			log.AddHook(hook)
+		} else {
+			log.WithError(err).Fatal("Failed to create syslog hook")
+		}
+	}
+}
+
 func runService() {
 	store := createStore("root")
+
+	initSyslog(util.Config.Log.Channels.Syslog)
+
 	state := proTasks.NewTaskStateStore()
 	terraformStore := proFactory.NewTerraformStore(store)
 	ansibleTaskRepo := proFactory.NewAnsibleTaskRepository(store)

services/tasks/TaskPool.go

@@ -170,7 +170,7 @@ func (p *TaskPool) Run() {
 
 			db.StoreSession(p.store, "new task", func() {
 				//p.Queue = append(p.Queue, task)
-				msg := "Task " + strconv.Itoa(task.Task.ID) + " added to queue"
+				msg := "Task " + getTaskName(task) + " added to queue"
 				task.Log(msg)
 				log.Info(msg)
 				task.saveStatus()
@@ -184,6 +184,10 @@ func (p *TaskPool) Run() {
 	}
 }
 
+func getTaskName(t *TaskRunner) string {
+	return t.Template.Name + " " + strconv.Itoa(t.Task.ID)
+}
+
 func (p *TaskPool) handleQueue() {
 	for t := range p.queueEvents {
 		switch t.eventType {
@@ -208,7 +212,7 @@ func (p *TaskPool) handleQueue() {
 			if curr.Task.Status == task_logger.TaskFailStatus {
 				//delete failed TaskRunner from queue
 				_ = p.state.DequeueAt(i)
-				log.Info("Task " + strconv.Itoa(curr.Task.ID) + " removed from queue")
+				log.Info("Task " + getTaskName(curr) + " removed from queue")
 				continue
 			}
 
@@ -313,10 +317,10 @@ func (p *TaskPool) writeLogs(logs []logRecord) {
 }
 
 func runTask(task *TaskRunner, p *TaskPool) {
-	log.Info("Set resource locker with TaskRunner " + strconv.Itoa(task.Task.ID))
+	log.Info("Set resource locker with TaskRunner " + getTaskName(task))
 	p.onTaskRun(task)
 
-	log.Info("Task " + strconv.Itoa(task.Task.ID) + " started")
+	log.Info("Task " + getTaskName(task) + " started")
 	go func() {
 		time.Sleep(1 * time.Second)
 		task.run()

util/config.go

@@ -157,9 +157,21 @@ type TaskLogType struct {
 	ResultLogger *lumberjack.Logger `json:"result_logger,omitempty" env:"SEMAPHORE_TASK_RESULT_LOGGER"`
 }
 
+type ConfigLogChannels struct {
+	Syslog *SyslogConfig `json:"syslog,omitempty"`
+}
+
 type ConfigLog struct {
-	Events *EventLogType `json:"events,omitempty"`
-	Tasks  *TaskLogType  `json:"tasks,omitempty"`
+	Events   *EventLogType      `json:"events,omitempty"`
+	Tasks    *TaskLogType       `json:"tasks,omitempty"`
+	Channels *ConfigLogChannels `json:"channels,omitempty"`
+}
+
+type SyslogConfig struct {
+	Enabled bool   `json:"enabled" env:"SEMAPHORE_SYSLOG_ENABLED"`
+	Network string `json:"network,omitempty" env:"SEMAPHORE_SYSLOG_NETWORK"`
+	Address string `json:"address,omitempty" env:"SEMAPHORE_SYSLOG_ADDRESS"`
+	Tag     string `json:"tag,omitempty" env:"SEMAPHORE_SYSLOG_TAG"`
 }
 
 type ConfigProcess struct {