3 files changed, 21 insertions, 6 deletions
diff --git a/cmd/rr/cmd/serve.go b/cmd/rr/cmd/serve.go
index c53f7ce9..664baf15 100644
--- a/cmd/rr/cmd/serve.go
+++ b/cmd/rr/cmd/serve.go
@@ -36,12 +36,15 @@ func init() {
 		RunE:  serveHandler,
 	})
 
-	signal.Notify(stopSignal, syscall.SIGTERM)
-	signal.Notify(stopSignal, syscall.SIGINT)
+	signal.Notify(stopSignal, os.Interrupt, os.Kill, syscall.SIGTERM)
 }
 
 func serveHandler(cmd *cobra.Command, args []string) error {
-	go Container.Serve()
+	go func() {
+		Container.Serve()
+		stopSignal <- nil
+	}()
+
 	<-stopSignal
 	Container.Stop()
 
diff --git a/cmd/rr/cmd/version.go b/cmd/rr/cmd/version.go
index 5edb7543..b134a70b 100644
--- a/cmd/rr/cmd/version.go
+++ b/cmd/rr/cmd/version.go
@@ -1,6 +1,10 @@
 package cmd
 
+import "time"
+
 var (
-	Version   = "1.0.0"       // Placeholder for the version
-	BuildTime = "development" // Placeholder for the build time
+	// Version - defines build version.
+	Version = "development"
+	// BuildTime - defined build time.
+	BuildTime = time.Now()
 )
diff --git a/cmd/rr/debug/debugger.go b/cmd/rr/debug/debugger.go
index 0621285b..0dca43de 100644
--- a/cmd/rr/debug/debugger.go
+++ b/cmd/rr/debug/debugger.go
@@ -5,6 +5,7 @@ import (
 	"github.com/spiral/roadrunner"
 	"github.com/spiral/roadrunner/cmd/rr/utils"
 	"github.com/spiral/roadrunner/service/http"
+	"strings"
 )
 
 // Listener creates new debug listener.
@@ -45,7 +46,6 @@ func (s *debugger) listener(event int, ctx interface{}) {
 			"<white+hb>worker.%v</reset> <yellow>killed</red>",
 			*w.Pid,
 		))
-
 	case roadrunner.EventWorkerError:
 		err := ctx.(roadrunner.WorkerError)
 		s.logger.Error(utils.Sprintf(
@@ -55,6 +55,12 @@ func (s *debugger) listener(event int, ctx interface{}) {
 		))
 	}
 
+	// outputs
+	switch event {
+	case roadrunner.EventStderrOutput:
+		s.logger.Warning(strings.Trim(string(ctx.([]byte)), "\r\n"))
+	}
+
 	// rr server events
 	switch event {
 	case roadrunner.EventServerFailure:
@@ -68,6 +74,8 @@ func (s *debugger) listener(event int, ctx interface{}) {
 	case roadrunner.EventPoolError:
 		s.logger.Error(utils.Sprintf("<red>%s</reset>", ctx))
 	}
+
+	//s.logger.Warning(event, ctx)
 }
 
 func statusColor(status int) string {