mod updated

2 files changed, 0 insertions, 226 deletions

diff --git a/cmd/rr/http/reset.go b/cmd/rr/http/reset.go
deleted file mode 100644
index 3bc089ec..00000000
--- a/cmd/rr/http/reset.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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 (
-	"errors"
-	"github.com/spf13/cobra"
-	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/cmd/rr/utils"
-	"github.com/spiral/roadrunner/service"
-	"github.com/spiral/roadrunner/service/rpc"
-)
-
-func init() {
-	rr.CLI.AddCommand(&cobra.Command{
-		Use:   "http:reset",
-		Short: "Reload RoadRunner worker pools for the HTTP service",
-		RunE:  reloadHandler,
-	})
-}
-
-func reloadHandler(cmd *cobra.Command, args []string) error {
-	svc, st := rr.Container.Get(rpc.ID)
-	if st < service.StatusOK {
-		return errors.New("RPC service is not configured")
-	}
-
-	client, err := svc.(*rpc.Service).Client()
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	utils.Printf("<green>restarting http worker pool</reset>: ")
-
-	var r string
-	if err := client.Call("http.Reset", true, &r); err != nil {
-		return err
-	}
-
-	utils.Printf("<green+hb>done</reset>\n")
-	return nil
-}
diff --git a/cmd/rr/http/workers.go b/cmd/rr/http/workers.go
deleted file mode 100644
index b03c273f..00000000
--- a/cmd/rr/http/workers.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// 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 (
-	"errors"
-	tm "github.com/buger/goterm"
-	"github.com/dustin/go-humanize"
-	"github.com/olekukonko/tablewriter"
-	"github.com/shirou/gopsutil/process"
-	"github.com/spf13/cobra"
-	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/cmd/rr/utils"
-	"github.com/spiral/roadrunner/service"
-	"github.com/spiral/roadrunner/service/http"
-	rrpc "github.com/spiral/roadrunner/service/rpc"
-	"net/rpc"
-	"os"
-	"os/signal"
-	"strconv"
-	"syscall"
-	"time"
-)
-
-var (
-	interactive bool
-	stopSignal  = make(chan os.Signal, 1)
-)
-
-func init() {
-	workersCommand := &cobra.Command{
-		Use:   "http:workers",
-		Short: "List workers associated with RoadRunner HTTP service",
-		RunE:  workersHandler,
-	}
-
-	workersCommand.Flags().BoolVarP(
-		&interactive,
-		"interactive",
-		"i",
-		false,
-		"render interactive workers table",
-	)
-
-	rr.CLI.AddCommand(workersCommand)
-
-	signal.Notify(stopSignal, syscall.SIGTERM)
-	signal.Notify(stopSignal, syscall.SIGINT)
-}
-
-func workersHandler(cmd *cobra.Command, args []string) (err error) {
-	defer func() {
-		if r, ok := recover().(error); ok {
-			err = r
-		}
-	}()
-
-	svc, st := rr.Container.Get(rrpc.ID)
-	if st < service.StatusOK {
-		return errors.New("RPC service is not configured")
-	}
-
-	client, err := svc.(*rrpc.Service).Client()
-	if err != nil {
-		return err
-	}
-	defer client.Close()
-
-	if !interactive {
-		showWorkers(client)
-		return nil
-	}
-
-	tm.Clear()
-	for {
-		select {
-		case <-stopSignal:
-			return nil
-		case <-time.NewTicker(time.Millisecond * 500).C:
-			tm.MoveCursor(1, 1)
-			showWorkers(client)
-			tm.Flush()
-		}
-	}
-}
-
-func showWorkers(client *rpc.Client) {
-	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", "Execs", "Memory", "Created"})
-	tw.SetColMinWidth(0, 7)
-	tw.SetColMinWidth(1, 9)
-	tw.SetColMinWidth(2, 7)
-	tw.SetColMinWidth(3, 7)
-	tw.SetColMinWidth(4, 18)
-
-	for _, w := range r.Workers {
-		tw.Append([]string{
-			strconv.Itoa(w.Pid),
-			renderStatus(w.Status),
-			renderJobs(w.NumJobs),
-			renderMemory(w.Pid),
-			renderAlive(time.Unix(0, w.Created)),
-		})
-	}
-
-	tw.Render()
-}
-
-func renderStatus(status string) string {
-	switch status {
-	case "inactive":
-		return utils.Sprintf("<yellow>inactive</reset>")
-	case "ready":
-		return utils.Sprintf("<cyan>ready</reset>")
-	case "working":
-		return utils.Sprintf("<green>working</reset>")
-	case "stopped":
-		return utils.Sprintf("<red>stopped</reset>")
-	case "errored":
-		return utils.Sprintf("<red>errored</reset>")
-	}
-
-	return status
-}
-
-func renderJobs(number int64) string {
-	return humanize.Comma(int64(number))
-}
-
-func renderAlive(t time.Time) string {
-	return humanize.RelTime(t, time.Now(), "ago", "")
-}
-
-func renderMemory(pid int) string {
-	p, _ := process.NewProcess(int32(pid))
-	i, err := p.MemoryInfo()
-	if err != nil {
-		return err.Error()
-	}
-
-	return humanize.Bytes(i.RSS)
-}