File tree Expand file tree Collapse file tree 2 files changed +21
-5
lines changed Expand file tree Collapse file tree 2 files changed +21
-5
lines changed Original file line number Diff line number Diff line change @@ -41,9 +41,21 @@ Complete documentation is available at https://semaphoreui.com.`,
41
41
return
42
42
}
43
43
44
- lvl , err := log .ParseLevel (persistentFlags .logLevel )
45
- if err != nil {
46
- log .Panic (err )
44
+ lvl := log .InfoLevel
45
+ var err error
46
+
47
+ if os .Getenv ("SEMAPHORE_LOG_LEVEL" ) != "" {
48
+ lvl , err = log .ParseLevel (os .Getenv ("SEMAPHORE_LOG_LEVEL" ))
49
+ if err != nil {
50
+ log .Panic (err )
51
+ }
52
+ }
53
+
54
+ if persistentFlags .logLevel != "" {
55
+ lvl , err = log .ParseLevel (persistentFlags .logLevel )
56
+ if err != nil {
57
+ log .Panic (err )
58
+ }
47
59
}
48
60
49
61
log .SetLevel (lvl )
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ package tasks
3
3
import (
4
4
"encoding/json"
5
5
"errors"
6
- "github.com/semaphoreui/semaphore/services/tasks/hooks"
7
6
"github.com/semaphoreui/semaphore/pkg/tz"
7
+ "github.com/semaphoreui/semaphore/services/tasks/hooks"
8
8
"os"
9
9
"strconv"
10
10
"strings"
@@ -192,7 +192,11 @@ func (t *TaskRunner) run() {
192
192
if t .job .IsKilled () {
193
193
t .SetStatus (task_logger .TaskStoppedStatus )
194
194
} else {
195
- log .WithError (err ).Warn ("Failed to run task" )
195
+ log .WithError (err ).WithFields (log.Fields {
196
+ "task_id" : t .Task .ID ,
197
+ "context" : "task_runner" ,
198
+ "task_status" : t .Task .Status ,
199
+ }).Warn ("Failed to run task" )
196
200
t .Log ("Failed to run task: " + err .Error ())
197
201
t .SetStatus (task_logger .TaskFailStatus )
198
202
}
You can’t perform that action at this time.
0 commit comments