Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-03 22:45:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

扩展stop命令允许指定nodeid

Browse Source
This commit is contained in:
boyce
2021-03-10 15:17:21 +08:00
parent 201c8367d6
commit 3758fc02e0
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
node/node.go
View File

@@ -39,7 +39,7 @@ func init() {
console.RegisterCommandBool("help",false,"<-help> This help.",usage) console.RegisterCommandBool("help",false,"<-help> This help.",usage)
console.RegisterCommandString("start","","<-start nodeid=nodeid> Run originserver.",startNode) console.RegisterCommandString("start","","<-start nodeid=nodeid> Run originserver.",startNode)
console.RegisterCommandBool("stop",false,"<-stop> Stop originserver process.",stopNode) console.RegisterCommandString("stop","","<-stop nodeid=nodeid> Stop originserver process.",stopNode)
console.RegisterCommandString("config","","<-config path> Configuration file path.",setConfigPath) console.RegisterCommandString("config","","<-config path> Configuration file path.",setConfigPath)
console.RegisterCommandString("console", "", "<-console true|false> Turn on or off screen log output.", openConsole) console.RegisterCommandString("console", "", "<-console true|false> Turn on or off screen log output.", openConsole)
console.RegisterCommandString("loglevel", "debug", "<-loglevel debug|release|warning|error|fatal> Set loglevel.", setLevel) console.RegisterCommandString("loglevel", "debug", "<-loglevel debug|release|warning|error|fatal> Set loglevel.", setLevel)
@@ -91,8 +91,8 @@ func setConfigPath(val interface{}) error{
return nil return nil
} }
func getRunProcessPid() (int,error) { func getRunProcessPid(nodeId int) (int,error) {
f, err := os.OpenFile(os.Args[0]+".pid", os.O_RDONLY, 0600) f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid",os.Args[0],nodeId), os.O_RDONLY, 0600)
defer f.Close() defer f.Close()
if err!= nil { if err!= nil {
return 0,err return 0,err
@@ -106,9 +106,9 @@ func getRunProcessPid() (int,error) {
return strconv.Atoi(string(pidByte)) return strconv.Atoi(string(pidByte))
} }
func writeProcessPid() { func writeProcessPid(nodeId int) {
//pid //pid
f, err := os.OpenFile(os.Args[0]+".pid", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600) f, err := os.OpenFile(fmt.Sprintf("%s_%d.pid",os.Args[0],nodeId), os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
defer f.Close() defer f.Close()
if err != nil { if err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
@@ -174,12 +174,25 @@ func Start() {
} }
func stopNode(args interface{}) error { func stopNode(args interface{}) error {
isStop := args.(bool) //1.解析参数
if isStop == false{ param := args.(string)
if param == "" {
return nil return nil
} }
processId,err := getRunProcessPid() sParam := strings.Split(param,"=")
if len(sParam) != 2 {
return fmt.Errorf("invalid option %s",param)
}
if sParam[0]!="nodeid" {
return fmt.Errorf("invalid option %s",param)
}
nodeId,err:= strconv.Atoi(sParam[1])
if err != nil {
return fmt.Errorf("invalid option %s",param)
}
processId,err := getRunProcessPid(nodeId)
if err != nil { if err != nil {
return err return err
} }
@@ -224,7 +237,7 @@ func startNode(args interface{}) error{
service.Start() service.Start()
//5.记录进程id号 //5.记录进程id号
writeProcessPid() writeProcessPid(nodeId)
//6.监听程序退出信号&性能报告 //6.监听程序退出信号&性能报告
bRun := true bRun := true