diff --git a/README.md b/README.md index 9dd39a7f..b55b06bd 100644 --- a/README.md +++ b/README.md @@ -682,8 +682,6 @@ time="2020-09-10T17:22:35Z" level=debug msg="loading domain: messaging" time="2020-09-10T17:22:35Z" level=debug msg="loading descriptor: key=messaging.message_type_marketing" time="2020-09-10T17:22:35Z" level=debug msg="loading descriptor: key=messaging.message_type_marketing.to_number ratelimit={requests_per_unit=5, unit=DAY}" time="2020-09-10T17:22:35Z" level=debug msg="loading descriptor: key=messaging.to_number ratelimit={requests_per_unit=100, unit=DAY}" -time="2020-09-10T17:21:55Z" level=warning msg="Listening for debug on ':6070'" -time="2020-09-10T17:21:55Z" level=warning msg="Listening for HTTP on ':8080'" time="2020-09-10T17:21:55Z" level=debug msg="waiting for runtime update" time="2020-09-10T17:21:55Z" level=warning msg="Listening for gRPC on ':8081'" ``` @@ -701,8 +699,6 @@ Output example: {"@message":"loading descriptor: key=messaging.message_type_marketing","@timestamp":"2020-09-10T17:22:44.926019315Z","level":"debug"} {"@message":"loading descriptor: key=messaging.message_type_marketing.to_number ratelimit={requests_per_unit=5, unit=DAY}","@timestamp":"2020-09-10T17:22:44.926037174Z","level":"debug"} {"@message":"loading descriptor: key=messaging.to_number ratelimit={requests_per_unit=100, unit=DAY}","@timestamp":"2020-09-10T17:22:44.926048993Z","level":"debug"} -{"@message":"Listening for debug on ':6070'","@timestamp":"2020-09-10T17:22:44.926113905Z","level":"warning"} -{"@message":"Listening for gRPC on ':8081'","@timestamp":"2020-09-10T17:22:44.926182006Z","level":"warning"} {"@message":"Listening for HTTP on ':8080'","@timestamp":"2020-09-10T17:22:44.926227031Z","level":"warning"} {"@message":"waiting for runtime update","@timestamp":"2020-09-10T17:22:44.926267808Z","level":"debug"} ``` diff --git a/src/server/server_impl.go b/src/server/server_impl.go index 96daab9a..a7dae7df 100644 --- a/src/server/server_impl.go +++ b/src/server/server_impl.go @@ -160,39 +160,9 @@ func (server *server) GrpcServer() *grpc.Server { } func (server *server) Start() { - go func() { - logger.Warnf("Listening for debug on '%s'", server.debugAddress) - var err error - server.listenerMu.Lock() - server.debugListener.listener, err = reuseport.Listen("tcp", server.debugAddress) - server.listenerMu.Unlock() - - if err != nil { - logger.Errorf("Failed to open debug HTTP listener: '%+v'", err) - return - } - err = http.Serve(server.debugListener.listener, server.debugListener.debugMux) - logger.Infof("Failed to start debug server '%+v'", err) - }() - go server.startGrpc() server.handleGracefulShutdown() - - logger.Warnf("Listening for HTTP on '%s'", server.httpAddress) - list, err := reuseport.Listen("tcp", server.httpAddress) - if err != nil { - logger.Fatalf("Failed to open HTTP listener: '%+v'", err) - } - srv := &http.Server{Handler: server.router} - server.listenerMu.Lock() - server.httpServer = srv - server.listenerMu.Unlock() - err = srv.Serve(list) - - if err != http.ErrServerClosed { - logger.Fatal(err) - } } func (server *server) startGrpc() {