summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-10-19 14:26:37 +0300
committerValery Piashchynski <[email protected]>2021-10-19 14:26:37 +0300
commit02e30f6e2e3ce3991565b0abdd9f83f08f9d30d3 (patch)
tree681efd0269c6e34792e6b5ccf5de948a358207d0
parentc1c4136e86bf71837c7995ff75d859b4b68f0616 (diff)
Update process exit event
Signed-off-by: Valery Piashchynski <[email protected]>
-rw-r--r--events/worker_events.go4
-rwxr-xr-xpool/static_pool.go3
-rwxr-xr-xworker_watcher/worker_watcher.go5
3 files changed, 7 insertions, 5 deletions
diff --git a/events/worker_events.go b/events/worker_events.go
index 39c38e57..6b80df61 100644
--- a/events/worker_events.go
+++ b/events/worker_events.go
@@ -7,6 +7,8 @@ const (
EventWorkerLog
// EventWorkerStderr is the worker standard error output
EventWorkerStderr
+ // EventWorkerWaitExit is the worker exit event
+ EventWorkerWaitExit
)
type W int64
@@ -19,6 +21,8 @@ func (ev W) String() string {
return "EventWorkerLog"
case EventWorkerStderr:
return "EventWorkerStderr"
+ case EventWorkerWaitExit:
+ return "EventWorkerWaitExit"
}
return UnknownEventType
}
diff --git a/pool/static_pool.go b/pool/static_pool.go
index f500f998..91bd1c2c 100755
--- a/pool/static_pool.go
+++ b/pool/static_pool.go
@@ -202,11 +202,10 @@ func (sp *StaticPool) execWithTTL(ctx context.Context, p *payload.Payload) (*pay
}
func (sp *StaticPool) stopWorker(w worker.BaseProcess) {
- const op = errors.Op("static_pool_stop_worker")
w.State().Set(worker.StateInvalid)
err := w.Stop()
if err != nil {
- sp.events.Push(events.WorkerEvent{Event: events.EventWorkerError, Worker: w, Payload: errors.E(op, err)})
+ sp.events.Push(events.WorkerEvent{Event: events.EventWorkerError, Worker: w, Payload: err})
}
}
diff --git a/worker_watcher/worker_watcher.go b/worker_watcher/worker_watcher.go
index 73a6cf1d..175972e0 100755
--- a/worker_watcher/worker_watcher.go
+++ b/worker_watcher/worker_watcher.go
@@ -279,9 +279,8 @@ func (ww *workerWatcher) wait(w worker.BaseProcess) {
err := w.Wait()
if err != nil {
ww.events.Push(events.WorkerEvent{
- Event: events.EventWorkerError,
- Worker: w,
- Payload: errors.E(op, err),
+ Event: events.EventWorkerWaitExit,
+ Payload: err,
})
}