Merge branch 'feature/1.2.3' into feature/1.3.0

1 files changed, 5 insertions, 28 deletions

diff --git a/service/http/rpc.go b/service/http/rpc.go
index 9dfe718e..08b3f262 100644
--- a/service/http/rpc.go
+++ b/service/http/rpc.go
@@ -2,6 +2,7 @@ package http
 
 import (
 	"github.com/pkg/errors"
+	"github.com/spiral/roadrunner/util"
 )
 
 type rpcServer struct{ svc *Service }
@@ -9,22 +10,7 @@ type rpcServer struct{ svc *Service }
 // WorkerList contains list of workers.
 type WorkerList struct {
 	// Workers is list of workers.
-	Workers []Worker `json:"workers"`
-}
-
-// Worker provides information about specific worker.
-type Worker struct {
-	// Pid contains process id.
-	Pid int `json:"pid"`
-
-	// Status of the worker.
-	Status string `json:"status"`
-
-	// Number of worker executions.
-	NumJobs int64 `json:"numExecs"`
-
-	// Created is unix nano timestamp of worker creation time.
-	Created int64 `json:"created"`
+	Workers []*util.State `json:"workers"`
 }
 
 // Reset resets underlying RR worker pool and restarts all of it's workers.
@@ -38,20 +24,11 @@ func (rpc *rpcServer) Reset(reset bool, r *string) error {
 }
 
 // Workers returns list of active workers and their stats.
-func (rpc *rpcServer) Workers(list bool, r *WorkerList) error {
+func (rpc *rpcServer) Workers(list bool, r *WorkerList) (err error) {
 	if rpc.svc == nil || rpc.svc.srv == nil {
 		return errors.New("http server is not running")
 	}
 
-	for _, w := range rpc.svc.rr.Workers() {
-		state := w.State()
-		r.Workers = append(r.Workers, Worker{
-			Pid:     *w.Pid,
-			Status:  state.String(),
-			NumJobs: state.NumExecs(),
-			Created: w.Created.UnixNano(),
-		})
-	}
-
-	return nil
+	r.Workers, err = util.ServerState(rpc.svc.rr)
+	return err
 }