fix: move some function + add level in log (#5177)

ovh · May 13, 2020 · 2fae99d · 2fae99d
1 parent 21b845b
commit 2fae99d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/engine/cdn/cdn_log.go b/engine/cdn/cdn_log.go
@@ -139,7 +139,26 @@ func (s *Service) handleWorkerLog(ctx context.Context, workerID string, sig inte
 	if !strings.HasSuffix(logs.Val, "\n") {
 		logs.Val += "\n"
 	}
-
+	var lvl string
+	switch m.Level {
+	case int32(hook.LOG_DEBUG):
+		lvl = "DEBUG"
+	case int32(hook.LOG_INFO):
+		lvl = "INFO"
+	case int32(hook.LOG_NOTICE):
+		lvl = "NOTICE"
+	case int32(hook.LOG_WARNING):
+		lvl = "WARN"
+	case int32(hook.LOG_ERR):
+		lvl = "ERROR"
+	case int32(hook.LOG_CRIT):
+		lvl = "CRITICAL"
+	case int32(hook.LOG_ALERT):
+		lvl = "ALERT"
+	case int32(hook.LOG_EMERG):
+		lvl = "EMERGENCY"
+	}
+	logs.Val = fmt.Sprintf("[%s] %s", lvl, logs.Val)
 	tx, err := s.Db.Begin()
 	if err != nil {
 		return sdk.WithStack(err)

diff --git a/engine/cdn/cdn_log_test.go b/engine/cdn/cdn_log_test.go
@@ -70,7 +70,7 @@ func TestWorkerLog(t *testing.T) {
 	logs, err := workflow.LoadLogs(s.Db, dbj.ID)
 	require.NoError(t, err)
 	require.Len(t, logs, 1)
-	require.Equal(t, "this is my message\n", logs[0].Val)
+	require.Equal(t, "[ALERT] this is my message\n", logs[0].Val)
 }
 
 func TestServiceLog(t *testing.T) {

diff --git a/engine/worker/internal/logger.go b/engine/worker/internal/logger.go
@@ -10,13 +10,6 @@ import (
 )
 
 func (wk *CurrentWorker) sendLog(buildID int64, value string, stepOrder int, final bool) error {
-	if wk.currentJob.wJob == nil {
-		log.Error(wk.GetContext(), "unable to send log: %s", value)
-		return nil
-	}
-	if err := wk.Blur(&value); err != nil {
-		return err
-	}
 	now := time.Now()
 	l := sdk.NewLog(buildID, wk.currentJob.wJob.WorkflowNodeRunID, value, stepOrder)
 	if final {

diff --git a/engine/worker/internal/types.go b/engine/worker/internal/types.go
@@ -85,6 +85,15 @@ func (wk *CurrentWorker) Parameters() []sdk.Parameter {
 }
 
 func (wk *CurrentWorker) SendLog(ctx context.Context, level workerruntime.Level, s string) {
+	if wk.currentJob.wJob == nil {
+		log.Error(wk.GetContext(), "unable to send log: %s. Job is nil", s)
+		return
+	}
+	if err := wk.Blur(&s); err != nil {
+		log.Error(wk.GetContext(), "unable to blur log: %v", err)
+		return
+	}
+
 	jobID, _ := workerruntime.JobID(ctx)
 	stepOrder, err := workerruntime.StepOrder(ctx)
 	if wk.logger.stepLogger == nil {
@@ -99,6 +108,7 @@ func (wk *CurrentWorker) SendLog(ctx context.Context, level workerruntime.Level,
 		}
 		return
 	}
+
 	var logLevel logrus.Level
 	switch level {
 	case workerruntime.LevelDebug: