simplier stuff

3 files changed, 13 insertions, 11 deletions

diff --git a/cmd/rr/cmd/root.go b/cmd/rr/cmd/root.go
index ac8466ef..a9f27e9d 100644
--- a/cmd/rr/cmd/root.go
+++ b/cmd/rr/cmd/root.go
@@ -33,7 +33,7 @@ import (
 // Service bus for all the commands.
 var (
 	// Shared service bus.
-	Bus *service.Bus
+	Bus = service.NewBus()
 
 	// Root is application endpoint.
 	Root = &cobra.Command{
@@ -47,8 +47,7 @@ var (
 
 // Execute adds all child commands to the Root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the Root.
-func Execute(serviceBus *service.Bus) {
-	Bus = serviceBus
+func Execute() {
 	if err := Root.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
diff --git a/cmd/rr/http/register.go b/cmd/rr/http/register.go
new file mode 100644
index 00000000..a670427c
--- /dev/null
+++ b/cmd/rr/http/register.go
@@ -0,0 +1,10 @@
+package http
+
+import (
+	rr "github.com/spiral/roadrunner/cmd/rr/cmd"
+	"github.com/spiral/roadrunner/http"
+)
+
+func init() {
+	rr.Bus.Register(&http.Service{})
+}
diff --git a/cmd/rr/main.go b/cmd/rr/main.go
index fe3de1c4..4d132da6 100644
--- a/cmd/rr/main.go
+++ b/cmd/rr/main.go
@@ -24,19 +24,12 @@ package main
 
 import (
 	"github.com/spiral/roadrunner/cmd/rr/cmd"
-	"github.com/spiral/roadrunner/service"
-	"github.com/spiral/roadrunner/http"
 
 	// service plugins
 	_ "github.com/spiral/roadrunner/cmd/rr/http"
 )
 
-var bus = service.NewBus()
-
 func main() {
-	// http server with PSR7 support
-	bus.Register(&http.Service{})
-
 	// you can register additional commands using cmd.Root
-	cmd.Execute(bus)
+	cmd.Execute()
 }