From f52156e76cf02e0b3de993fa6d9ba0d2f4e52001 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 25 Dec 2020 00:55:15 +0300 Subject: Initial commit of experiment --- cmd/cli/workers.go | 22 +++++++--------------- cmd/main.go | 7 ++++--- 2 files changed, 11 insertions(+), 18 deletions(-) (limited to 'cmd') diff --git a/cmd/cli/workers.go b/cmd/cli/workers.go index d34de40a..03639aa4 100644 --- a/cmd/cli/workers.go +++ b/cmd/cli/workers.go @@ -13,7 +13,7 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spiral/errors" - "github.com/spiral/roadrunner-plugins/informer" + "github.com/spiral/roadrunner/v2/plugins/informer" "github.com/spiral/roadrunner/v2/tools" ) @@ -22,6 +22,7 @@ var ( ) const InformerList string = "informer.List" +const InformerWorkers string = "informer.Workers" func init() { workersCommand := &cobra.Command{ @@ -42,7 +43,7 @@ func init() { } func workersHandler(cmd *cobra.Command, args []string) error { - const op = errors.Op("workers handler") + const op = errors.Op("workers cobra handler") // get RPC client client, err := RPCClient() if err != nil { @@ -94,25 +95,16 @@ func workersHandler(cmd *cobra.Command, args []string) error { } func showWorkers(plugins []string, client *rpc.Client) error { + const op = errors.Op("show workers") for _, plugin := range plugins { list := &informer.WorkerList{} - err := client.Call("informer.Workers", plugin, &list) + err := client.Call(InformerWorkers, plugin, &list) if err != nil { - return err - } - - // it's a golang :) - ps := make([]tools.ProcessState, len(list.Workers)) - for i := 0; i < len(list.Workers); i++ { - ps[i].Created = list.Workers[i].Created - ps[i].NumJobs = list.Workers[i].NumJobs - ps[i].MemoryUsage = list.Workers[i].MemoryUsage - ps[i].Pid = list.Workers[i].Pid - ps[i].Status = list.Workers[i].Status + return errors.E(op, err) } fmt.Printf("Workers of [%s]:\n", color.HiYellowString(plugin)) - tools.WorkerTable(os.Stdout, ps).Render() + tools.WorkerTable(os.Stdout, list.Workers).Render() } return nil } diff --git a/cmd/main.go b/cmd/main.go index 8151d4fe..5893fbcb 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,15 +4,16 @@ import ( "log" "github.com/spiral/endure" - "github.com/spiral/roadrunner-plugins/http" - "github.com/spiral/roadrunner-plugins/informer" + "github.com/spiral/roadrunner/v2/plugins/http" + "github.com/spiral/roadrunner/v2/plugins/informer" + "github.com/spiral/roadrunner/v2/plugins/server" + "github.com/spiral/roadrunner-plugins/logger" "github.com/spiral/roadrunner-plugins/metrics" "github.com/spiral/roadrunner-plugins/redis" "github.com/spiral/roadrunner-plugins/reload" "github.com/spiral/roadrunner-plugins/resetter" "github.com/spiral/roadrunner-plugins/rpc" - "github.com/spiral/roadrunner-plugins/server" "github.com/spiral/roadrunner/v2/cmd/cli" ) -- cgit v1.2.3 From 8526c03822e724bc2ebb64b6197085fea335b782 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 25 Dec 2020 14:46:01 +0300 Subject: Move root plugins to the pkg --- cmd/cli/workers.go | 2 +- cmd/main.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/cli/workers.go b/cmd/cli/workers.go index 03639aa4..94c339e2 100644 --- a/cmd/cli/workers.go +++ b/cmd/cli/workers.go @@ -13,7 +13,7 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spiral/errors" - "github.com/spiral/roadrunner/v2/plugins/informer" + "github.com/spiral/roadrunner/v2/pkg/plugins/informer" "github.com/spiral/roadrunner/v2/tools" ) diff --git a/cmd/main.go b/cmd/main.go index 5893fbcb..ec3d84ff 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,9 +4,9 @@ import ( "log" "github.com/spiral/endure" - "github.com/spiral/roadrunner/v2/plugins/http" - "github.com/spiral/roadrunner/v2/plugins/informer" - "github.com/spiral/roadrunner/v2/plugins/server" + "github.com/spiral/roadrunner/v2/pkg/plugins/http" + "github.com/spiral/roadrunner/v2/pkg/plugins/informer" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" "github.com/spiral/roadrunner-plugins/logger" "github.com/spiral/roadrunner-plugins/metrics" -- cgit v1.2.3 From 7a0dee1a416705c621edbf50e1f43fb39845348f Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Sat, 26 Dec 2020 00:40:31 +0300 Subject: Huge tests refactoring. Reduce running time 2-3x times --- cmd/cli/root.go | 4 ++-- cmd/cli/workers.go | 2 +- cmd/main.go | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'cmd') diff --git a/cmd/cli/root.go b/cmd/cli/root.go index febe410b..eb15f565 100644 --- a/cmd/cli/root.go +++ b/cmd/cli/root.go @@ -8,9 +8,9 @@ import ( "github.com/spiral/errors" goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc" - rpcPlugin "github.com/spiral/roadrunner-plugins/rpc" + rpcPlugin "github.com/spiral/roadrunner/v2/plugins/rpc" - "github.com/spiral/roadrunner-plugins/config" + "github.com/spiral/roadrunner/v2/plugins/config" "github.com/spf13/cobra" "github.com/spiral/endure" diff --git a/cmd/cli/workers.go b/cmd/cli/workers.go index 94c339e2..03639aa4 100644 --- a/cmd/cli/workers.go +++ b/cmd/cli/workers.go @@ -13,7 +13,7 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" "github.com/spiral/errors" - "github.com/spiral/roadrunner/v2/pkg/plugins/informer" + "github.com/spiral/roadrunner/v2/plugins/informer" "github.com/spiral/roadrunner/v2/tools" ) diff --git a/cmd/main.go b/cmd/main.go index ec3d84ff..4e7fc099 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,17 +4,17 @@ import ( "log" "github.com/spiral/endure" - "github.com/spiral/roadrunner/v2/pkg/plugins/http" - "github.com/spiral/roadrunner/v2/pkg/plugins/informer" - "github.com/spiral/roadrunner/v2/pkg/plugins/server" + "github.com/spiral/roadrunner/v2/plugins/http" + "github.com/spiral/roadrunner/v2/plugins/informer" + "github.com/spiral/roadrunner/v2/plugins/server" - "github.com/spiral/roadrunner-plugins/logger" - "github.com/spiral/roadrunner-plugins/metrics" - "github.com/spiral/roadrunner-plugins/redis" - "github.com/spiral/roadrunner-plugins/reload" - "github.com/spiral/roadrunner-plugins/resetter" - "github.com/spiral/roadrunner-plugins/rpc" "github.com/spiral/roadrunner/v2/cmd/cli" + "github.com/spiral/roadrunner/v2/plugins/logger" + "github.com/spiral/roadrunner/v2/plugins/metrics" + "github.com/spiral/roadrunner/v2/plugins/redis" + "github.com/spiral/roadrunner/v2/plugins/reload" + "github.com/spiral/roadrunner/v2/plugins/resetter" + "github.com/spiral/roadrunner/v2/plugins/rpc" ) func main() { -- cgit v1.2.3