diff options
| -rw-r--r-- | cmd/rr/cmd/serve.go | 3 | ||||
| -rw-r--r-- | service/http/rpc_test.go | 58 |
2 files changed, 1 insertions, 60 deletions
diff --git a/cmd/rr/cmd/serve.go b/cmd/rr/cmd/serve.go index c53f7ce9..4ae2a9d9 100644 --- a/cmd/rr/cmd/serve.go +++ b/cmd/rr/cmd/serve.go @@ -36,8 +36,7 @@ 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 { diff --git a/service/http/rpc_test.go b/service/http/rpc_test.go index 12bdb8d8..de7ed0c3 100644 --- a/service/http/rpc_test.go +++ b/service/http/rpc_test.go @@ -124,64 +124,6 @@ func Test_RPC_Unix(t *testing.T) { assert.NotEqual(t, res, res2) } -func Test_RPC_Unix_2(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("not supported on " + runtime.GOOS) - } - - logger, _ := test.NewNullLogger() - logger.SetLevel(logrus.DebugLevel) - - c := service.NewContainer(logger) - c.Register(rpc.ID, &rpc.Service{}) - c.Register(ID, &Service{}) - - assert.NoError(t, c.Init(&testCfg{ - rpcCfg: `{"enable":true, "listen":"unix://` + tmpDir() + `/rpc.unix"}`, - httpCfg: `{ - "enable": true, - "address": ":6029", - "maxRequest": 1024, - "uploads": { - "dir": ` + tmpDir() + `, - "forbid": [] - }, - "workers":{ - "command": "php ../../php-src/tests/http/client.php pid pipes", - "relay": "pipes", - "pool": { - "numWorkers": 1, - "allocateTimeout": 10000000, - "destroyTimeout": 10000000 - } - } - }`})) - - s, _ := c.Get(ID) - ss := s.(*Service) - - s2, _ := c.Get(rpc.ID) - rs := s2.(*rpc.Service) - - go func() { c.Serve() }() - time.Sleep(time.Millisecond * 100) - defer c.Stop() - - res, _, _ := get("http://localhost:6029") - assert.Equal(t, strconv.Itoa(*ss.rr.Workers()[0].Pid), res) - - cl, err := rs.Client() - assert.NoError(t, err) - - r := "" - assert.NoError(t, cl.Call("http.Reset", true, &r)) - assert.Equal(t, "OK", r) - - res2, _, _ := get("http://localhost:6029") - assert.Equal(t, strconv.Itoa(*ss.rr.Workers()[0].Pid), res2) - assert.NotEqual(t, res, res2) -} - func Test_Workers(t *testing.T) { logger, _ := test.NewNullLogger() logger.SetLevel(logrus.DebugLevel) |