service bus, http service, rpc bus, cli commands, new configs

2 files changed, 114 insertions, 0 deletions

diff --git a/cmd/rr/http/reload.go b/cmd/rr/http/reload.go
new file mode 100644
index 00000000..6caf0a71
--- /dev/null
+++ b/cmd/rr/http/reload.go
@@ -0,0 +1,50 @@
+// Copyright (c) 2018 SpiralScout
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package http
+
+import (
+	"github.com/spf13/cobra"
+	"fmt"
+	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
+)
+
+func init() {
+	rr.Root.AddCommand(&cobra.Command{
+		Use:   "http:reload",
+		Short: "Reload RoadRunner worker pools for the HTTP service",
+		Run:   reloadHandler,
+	})
+}
+
+func reloadHandler(cmd *cobra.Command, args []string) {
+	client, err := rr.Bus.RCPClient()
+	if err != nil {
+		panic(err) // todo: change
+	}
+	defer client.Close()
+
+	var r string
+	if err := client.Call("http.Reset", true, &r); err != nil {
+		panic(err)
+	}
+
+	fmt.Println(r)
+}
diff --git a/cmd/rr/http/workers.go b/cmd/rr/http/workers.go
new file mode 100644
index 00000000..c1225987
--- /dev/null
+++ b/cmd/rr/http/workers.go
@@ -0,0 +1,64 @@
+// Copyright (c) 2018 SpiralScout
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+package http
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spiral/roadrunner/http"
+	"github.com/olekukonko/tablewriter"
+	"os"
+	"strconv"
+	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
+)
+
+func init() {
+	rr.Root.AddCommand(&cobra.Command{
+		Use:   "http:workers",
+		Short: "List workers associated with RoadRunner HTTP service",
+		Run:   workersHandler,
+	})
+}
+
+func workersHandler(cmd *cobra.Command, args []string) {
+	client, err := rr.Bus.RCPClient()
+	if err != nil {
+		panic(err) // todo: change
+	}
+	defer client.Close()
+
+	var r http.WorkerList
+	if err := client.Call("http.Workers", true, &r); err != nil {
+		panic(err)
+	}
+
+	tw := tablewriter.NewWriter(os.Stdout)
+	tw.SetHeader([]string{"PID", "Status", "Num Execs"})
+
+	for _, w := range r.Workers {
+		tw.Append([]string{
+			strconv.Itoa(w.Pid),
+			w.Status,
+			strconv.Itoa(int(w.NumExecs)),
+		})
+	}
+
+	tw.Render()
+}