fix stop command

3 files changed, 1 insertions, 92 deletions

diff --git a/cmd/rr-ce/LICENSE b/cmd/rr-ce/LICENSE
deleted file mode 100644
index efb98c87..00000000
--- a/cmd/rr-ce/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-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.
\ No newline at end of file
diff --git a/cmd/rr-ce/main.go b/cmd/rr-ce/main.go
deleted file mode 100644
index 4f13ff63..00000000
--- a/cmd/rr-ce/main.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// MIT License
-//
-// 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 main
-
-import (
-	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/service/limit"
-
-	// services (plugins)
-	"github.com/spiral/jobs"
-	"github.com/spiral/php-grpc"
-	"github.com/spiral/roadrunner/service/env"
-	"github.com/spiral/roadrunner/service/http"
-	"github.com/spiral/roadrunner/service/rpc"
-	"github.com/spiral/roadrunner/service/static"
-
-	// queue brokers
-	"github.com/spiral/jobs/broker/amqp"
-	"github.com/spiral/jobs/broker/beanstalk"
-	"github.com/spiral/jobs/broker/ephemeral"
-	"github.com/spiral/jobs/broker/sqs"
-
-	// additional commands and debug handlers
-	_ "github.com/spiral/jobs/cmd/rr-jobs/jobs"
-	_ "github.com/spiral/php-grpc/cmd/rr-grpc/grpc"
-	_ "github.com/spiral/roadrunner/cmd/rr/http"
-	_ "github.com/spiral/roadrunner/cmd/rr/limit"
-)
-
-func main() {
-	rr.Container.Register(env.ID, &env.Service{})
-	rr.Container.Register(rpc.ID, &rpc.Service{})
-	rr.Container.Register(http.ID, &http.Service{})
-	rr.Container.Register(static.ID, &static.Service{})
-	rr.Container.Register(grpc.ID, &grpc.Service{})
-	rr.Container.Register(jobs.ID, &jobs.Service{
-		Brokers: map[string]jobs.Broker{
-			"amqp":      &amqp.Broker{},
-			"ephemeral": &ephemeral.Broker{},
-			"beanstalk": &beanstalk.Broker{},
-			"sqs":       &sqs.Broker{},
-		},
-	})
-
-	// supervisor
-	rr.Container.Register(limit.ID, &limit.Service{})
-
-	// you can register additional commands using cmd.CLI
-	rr.Execute()
-}
diff --git a/cmd/rr/cmd/stop.go b/cmd/rr/cmd/stop.go
index 5c6ed2a5..8beee73e 100644
--- a/cmd/rr/cmd/stop.go
+++ b/cmd/rr/cmd/stop.go
@@ -43,7 +43,7 @@ func stopHandler(cmd *cobra.Command, args []string) error {
 	util.Printf("<green>Stopping RoadRunner</reset>: ")
 
 	var r string
-	if err := client.Call("system.Detach", true, &r); err != nil {
+	if err := client.Call("system.Stop", true, &r); err != nil {
 		return err
 	}