upstream/webhookd
1
0
Fork 0
mirror of https://github.com/ncarlier/webhookd.git synced 2024-09-20 08:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(): improve log semantic

Browse Source
This commit is contained in:
Nicolas Carlier 2020-08-20 10:01:06 +00:00
parent 296ab6aaa3
commit 7433f69c92
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/work_request.go
View File

@ -17,7 +17,7 @@ import (
var workID uint64 var workID uint64
// WorkStatus is the status of a worload // WorkStatus is the status of a workload
type WorkStatus int type WorkStatus int
const ( const (
@ -46,7 +46,7 @@ type WorkRequest struct {
mutex sync.Mutex mutex sync.Mutex
} }
// NewWorkRequest creats new work request // NewWorkRequest creates new work request
func NewWorkRequest(name, script, payload, output string, args []string, timeout int) *WorkRequest { func NewWorkRequest(name, script, payload, output string, args []string, timeout int) *WorkRequest {
w := &WorkRequest{ w := &WorkRequest{
ID: atomic.AddUint64(&workID, 1), ID: atomic.AddUint64(&workID, 1),
@ -69,11 +69,11 @@ func (wr *WorkRequest) Terminate(err error) error {
if err != nil { if err != nil {
wr.Status = Error wr.Status = Error
wr.Err = err wr.Err = err
logger.Info.Printf("job %s#%d done [ERROR]\n", wr.Name, wr.ID) logger.Info.Printf("hook %s#%d done [ERROR]\n", wr.Name, wr.ID)
return err return err
} }
wr.Status = Success wr.Status = Success
logger.Info.Printf("job %s#%d done [SUCCESS]\n", wr.Name, wr.ID) logger.Info.Printf("hook %s#%d done [SUCCESS]\n", wr.Name, wr.ID)
return nil return nil
} }

2
pkg/worker/dispatcher.go
View File

@ -30,7 +30,7 @@ func StartDispatcher(nworkers int) {
go func() { go func() {
worker := <-WorkerQueue worker := <-WorkerQueue
logger.Debug.Printf("dispatching job request: %s#%d", work.Name, work.ID) logger.Debug.Printf("dispatching hook request: %s#%d", work.Name, work.ID)
worker <- work worker <- work
}() }()
} }

14
pkg/worker/work_runner.go
View File

@ -26,9 +26,9 @@ func (c *ChanWriter) Write(p []byte) (int, error) {
// Run work request // Run work request
func Run(work *model.WorkRequest) error { func Run(work *model.WorkRequest) error {
work.Status = model.Running work.Status = model.Running
logger.Info.Printf("job %s#%d started...\n", work.Name, work.ID) logger.Info.Printf("hook %s#%d started...\n", work.Name, work.ID)
logger.Debug.Printf("job %s#%d script: %s\n", work.Name, work.ID, work.Script) logger.Debug.Printf("hook %s#%d script: %s\n", work.Name, work.ID, work.Script)
logger.Debug.Printf("job %s#%d parameter: %v\n", work.Name, work.ID, work.Args) logger.Debug.Printf("hook %s#%d parameter: %v\n", work.Name, work.ID, work.Args)
binary, err := exec.LookPath(work.Script) binary, err := exec.LookPath(work.Script)
if err != nil { if err != nil {
@ -48,7 +48,7 @@ func Run(work *model.WorkRequest) error {
return work.Terminate(err) return work.Terminate(err)
} }
defer logFile.Close() defer logFile.Close()
logger.Debug.Printf("job %s#%d output file: %s\n", work.Name, work.ID, logFile.Name()) logger.Debug.Printf("hook %s#%d output file: %s\n", work.Name, work.ID, logFile.Name())
wLogFile := bufio.NewWriter(logFile) wLogFile := bufio.NewWriter(logFile)
defer wLogFile.Flush() defer wLogFile.Flush()
@ -83,7 +83,7 @@ func Run(work *model.WorkRequest) error {
if !work.IsTerminated() { if !work.IsTerminated() {
work.MessageChan <- []byte(line) work.MessageChan <- []byte(line)
} else { } else {
logger.Error.Printf("job %s#%d is over ; unable to write more data into the channel: %s\n", work.Name, work.ID, line) logger.Error.Printf("hook %s#%d is over ; unable to write more data into the channel: %s\n", work.Name, work.ID, line)
break break
} }
// writing to outfile // writing to outfile
@ -93,14 +93,14 @@ func Run(work *model.WorkRequest) error {
} }
} }
if err := scanner.Err(); err != nil { if err := scanner.Err(); err != nil {
logger.Error.Printf("job %s#%d is unable to read script stdout: %v\n", work.Name, work.ID, err) logger.Error.Printf("hook %s#%d is unable to read script stdout: %v\n", work.Name, work.ID, err)
} }
wg.Done() wg.Done()
}(cmdReader) }(cmdReader)
// Start timeout timer // Start timeout timer
timer := time.AfterFunc(time.Duration(work.Timeout)*time.Second, func() { timer := time.AfterFunc(time.Duration(work.Timeout)*time.Second, func() {
logger.Warning.Printf("job %s#%d has timed out (%ds): killing process #%d ...\n", work.Name, work.ID, work.Timeout, cmd.Process.Pid) logger.Warning.Printf("hook %s#%d has timed out (%ds): killing process #%d ...\n", work.Name, work.ID, work.Timeout, cmd.Process.Pid)
syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL) syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
}) })

2
pkg/worker/worker.go
View File

@ -42,7 +42,7 @@ func (w Worker) Start() {
select { select {
case work := <-w.Work: case work := <-w.Work:
// Receive a work request. // Receive a work request.
logger.Debug.Printf("worker #%d received job request: %s#%d\n", w.ID, work.Name, work.ID) logger.Debug.Printf("worker #%d received hook request: %s#%d\n", w.ID, work.Name, work.ID)
metric.Requests.Add(1) metric.Requests.Add(1)
err := Run(&work) err := Run(&work)
if err != nil { if err != nil {