From 91364a7cd86faad295cd33d3cd78c7c6098c87a7 Mon Sep 17 00:00:00 2001 From: boyce Date: Wed, 30 Jan 2019 14:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=91service=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=BE=AA=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cluster/cluster.go | 2 ++ network/httpserver.go | 2 ++ network/websocketserver.go | 2 ++ service/Service.go | 6 ++++-- sysservice/httpserverervice.go | 6 +++--- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cluster/cluster.go b/cluster/cluster.go index 9476efc..36a72af 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -105,11 +105,13 @@ func (slf *CCluster) ListenService() error { tcpaddr, err := net.ResolveTCPAddr("tcp4", bindStr) if err != nil { + os.Exit(1) return err } tcplisten, err2 := net.ListenTCP("tcp", tcpaddr) if err2 != nil { + os.Exit(1) return err2 } diff --git a/network/httpserver.go b/network/httpserver.go index f16bc42..be209b3 100644 --- a/network/httpserver.go +++ b/network/httpserver.go @@ -3,6 +3,7 @@ package network import ( "fmt" "net/http" + "os" "time" ) @@ -45,6 +46,7 @@ func (slf *HttpServer) startListen() error { err := slf.httpserver.ListenAndServe() if err != nil { fmt.Printf("http.ListenAndServe(%d, nil) error\n", slf.port) + os.Exit(1) } return nil diff --git a/network/websocketserver.go b/network/websocketserver.go index 36ed88d..4bfe7fc 100644 --- a/network/websocketserver.go +++ b/network/websocketserver.go @@ -3,6 +3,7 @@ package network import ( "fmt" "net/http" + "os" "sync" "time" @@ -101,6 +102,7 @@ func (slf *WebsocketServer) startListen() { err := slf.httpserver.ListenAndServe() if err != nil { fmt.Printf("http.ListenAndServe(%d, nil) error\n", slf.port) + os.Exit(1) } } diff --git a/service/Service.go b/service/Service.go index c96f8f0..17f81b5 100644 --- a/service/Service.go +++ b/service/Service.go @@ -139,7 +139,7 @@ func (slf *BaseService) Init(Iservice interface{}, servicetype int) error { } func (slf *BaseService) OnRunLoop() error { - return nil + return fmt.Errorf("None Loop") } func (slf *BaseService) Run(service IService, exit chan bool, pwaitGroup *sync.WaitGroup) error { @@ -153,7 +153,9 @@ func (slf *BaseService) Run(service IService, exit chan bool, pwaitGroup *sync.W default: } slf.tickTime = time.Now().UnixNano() / 1e6 - service.OnRunLoop() + if service.OnRunLoop() != nil { + break + } slf.tickTime = time.Now().UnixNano() / 1e6 } diff --git a/sysservice/httpserverervice.go b/sysservice/httpserverervice.go index 07d9961..6cbec41 100644 --- a/sysservice/httpserverervice.go +++ b/sysservice/httpserverervice.go @@ -85,8 +85,8 @@ func (slf *HttpServerService) httpHandler(w http.ResponseWriter, r *http.Request w.Write([]byte(msg)) } if r.Method != "POST" { - writeError(http.StatusMethodNotAllowed, "rpc: POST method required, received "+r.Method) - return + //writeError(http.StatusMethodNotAllowed, "rpc: POST method required, received "+r.Method) + //return } defer r.Body.Close() msg, err := ioutil.ReadAll(r.Body) @@ -94,7 +94,7 @@ func (slf *HttpServerService) httpHandler(w http.ResponseWriter, r *http.Request writeError(http.StatusBadRequest, "rpc: ioutil.ReadAll "+err.Error()) return } - fmt.Printf("PATH: %s\n%s\n", r.URL.Path, string(msg)) + // 在这儿处理例外路由接口 // 拼接得到rpc服务的名称