test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-12-02 20:28:17 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

修复服务注册时的控制器及执行对象方法丢失问题

Browse Source
This commit is contained in:
John 2018-05-18 11:01:22 +08:00
parent 6b256fdc41
commit 37e48f6f71
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
g/net/ghttp/ghttp_server_admin.go
View File

@ -22,6 +22,9 @@ import (
const (
gADMIN_ACTION_INTERVAL_LIMIT = 3000 // (毫秒)服务开启后允许执行管理操作的间隔限制
gADMIN_ACTION_RELOADING = 1
gADMIN_ACTION_RESTARTING = 2
gADMIN_ACTION_SHUTINGDOWN = 4
)
// 用于服务管理的对象
@ -34,9 +37,6 @@ var serverActionLocker sync.Mutex
var serverActionLastTime = gtype.NewInt64(gtime.Millisecond())
// 当前服务进程所处的互斥管理操作状态
// 1 : reload
// 2 : restart
// 4 : shutdown
var serverProcessStatus = gtype.NewInt()
// 服务管理首页
@ -111,6 +111,7 @@ func (s *Server) Reload() error {
if err := s.checkActionFrequence(); err != nil {
return err
}
serverProcessStatus.Set(gADMIN_ACTION_RELOADING)
glog.Printfln("%d: server reloading", gproc.Pid())
sendProcessMsg(gproc.Pid(), gMSG_RELOAD, nil)
return nil
@ -126,6 +127,7 @@ func (s *Server) Restart() error {
if err := s.checkActionFrequence(); err != nil {
return err
}
serverProcessStatus.Set(gADMIN_ACTION_RESTARTING)
glog.Printfln("%d: server restarting", gproc.Pid())
sendProcessMsg(gproc.Pid(), gMSG_RESTART, nil)
return nil
@ -141,6 +143,7 @@ func (s *Server) Shutdown() error {
if err := s.checkActionFrequence(); err != nil {
return err
}
serverProcessStatus.Set(gADMIN_ACTION_SHUTINGDOWN)
glog.Printfln("%d: server shutting down", gproc.Pid())
sendProcessMsg(gproc.PPid(), gMSG_SHUTDOWN, nil)
return nil
@ -161,11 +164,11 @@ func (s *Server) checkActionStatus() error {
status := serverProcessStatus.Val()
if status > 0 {
switch status {
case 1:
case gADMIN_ACTION_RELOADING:
return errors.New("server is reloading")
case 2:
case gADMIN_ACTION_RESTARTING:
return errors.New("server is restarting")
case 4:
case gADMIN_ACTION_SHUTINGDOWN:
return errors.New("server is shutting down")
}
}

2
g/net/ghttp/ghttp_server_service.go
View File

@ -53,7 +53,7 @@ func (s *Server)mergeMethodNameToPattern(pattern string, name string) string {
array := strings.Split(pattern, "@")
// 分离URI(其实可能包含HTTP Method)
uri := array[0]
uri = strings.TrimRight(uri, "/") + "/"
uri = strings.TrimRight(uri, "/") + "/" + method
// 加上指定域名后缀
if len(array) > 1 {
return uri + "@" + array[1]

15
geg/net/ghttp/reload/simple.go
View File

@ -1,22 +1,25 @@
package main
import (
"gitee.com/johng/gf/g"
"gitee.com/johng/gf/g/net/ghttp"
"gitee.com/johng/gf/g/os/gproc"
"time"
"gitee.com/johng/gf/g"
"gitee.com/johng/gf/g/os/gproc"
"gitee.com/johng/gf/g/net/ghttp"
)
func main() {
s := g.Server()
s.BindHandler("/", func(r *ghttp.Request){
r.Response.Writeln("哈喽！")
})
s.BindHandler("/pid", func(r *ghttp.Request){
r.Response.Writeln(gproc.Pid())
})
s.BindHandler("/sleep", func(r *ghttp.Request){
r.Response.Writeln(gproc.Pid())
time.Sleep(10*time.Second)
r.Response.Writeln(gproc.Pid())
})
s.BindHandler("/pid", func(r *ghttp.Request){
r.Response.Writeln(gproc.Pid())
})
s.EnableAdmin()
s.SetPort(8199)
s.Run()