test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-03 04:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
GLYASAI 2018-12-04 19:06:39 +08:00
commit 1ebaa7e57d
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/node/server/service_windows.go
View File

@ -23,6 +23,7 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"github.com/goodrain/rainbond/cmd/node/option"
utilwindows "github.com/goodrain/rainbond/util/windows"
@ -72,7 +73,7 @@ func initService(conf *option.Conf) (bool, error) {
}
func unregisterService() error {
if err := utilwindows.StopService(*flServiceName); err != nil {
if err := utilwindows.StopService(*flServiceName); err != nil && !strings.Contains(err.Error(), "service has not been started") {
return err
}
return utilwindows.UnRegisterService(*flServiceName)

38
node/nodem/controller/controller_service_windows.go
View File

@ -59,16 +59,24 @@ func (w *windowsServiceController) InitStart(services []*service.Service) error
}
func (w *windowsServiceController) StartService(name string) error {
return windows.StartService(name)
if err := windows.StartService(name); err != nil {
logrus.Errorf("windows service controller start service %s failure %s", name, err.Error())
return err
}
logrus.Infof("windows service controller start service %s", name)
return nil
}
func (w *windowsServiceController) StopService(name string) error {
return windows.StopService(name)
if err := windows.StopService(name); err != nil && !strings.Contains(err.Error(), "service has not been started") {
logrus.Errorf("windows service controller stop service %s failure %s", name, err.Error())
return err
}
logrus.Infof("windows service controller stop service %s", name)
return nil
}
func (w *windowsServiceController) StartList(list []*service.Service) error {
for _, s := range list {
if err := w.StartService(s.Name); err != nil {
logrus.Errorf("start service %s failure %s", s.Name, err.Error())
}
w.StartService(s.Name)
}
return nil
}
@ -79,11 +87,27 @@ func (w *windowsServiceController) StopList(list []*service.Service) error {
return nil
}
func (w *windowsServiceController) RestartService(serviceName string) error {
return windows.RestartService(serviceName)
if err := windows.RestartService(serviceName); err != nil {
logrus.Errorf("windows service controller restart service %s failure %s", serviceName, err.Error())
return err
}
logrus.Infof("windows service controller restart service %s", serviceName)
return nil
}
func (w *windowsServiceController) WriteConfig(s *service.Service) error {
cmds := strings.Split(s.Start, " ")
return windows.RegisterService(s.Name, cmds[0], "Rainbond "+s.Name, s.Requires, cmds)
if err := windows.RegisterService(s.Name, cmds[0], "Rainbond "+s.Name, s.Requires, cmds); err != nil {
if strings.Contains(err.Error(), "already exists") {
w.RemoveConfig(s.Name)
err = windows.RegisterService(s.Name, cmds[0], "Rainbond "+s.Name, s.Requires, cmds)
}
if err != nil {
logrus.Errorf("windows service controller register service %s failure %s", s.Name, err.Error())
return err
}
}
logrus.Infof("windows service controller register service %s success", s.Name)
return nil
}
func (w *windowsServiceController) RemoveConfig(name string) error {
return windows.UnRegisterService(name)

4
util/windows/service_windows.go
View File

@ -20,6 +20,7 @@ package windows
import (
"fmt"
"strings"
"time"
"unsafe"
@ -131,7 +132,8 @@ func StopService(serviceName string) error {
//RestartService restart a windows service
func RestartService(serviceName string) error {
if err := controlService(serviceName, svc.Stop, svc.Stopped); err != nil {
if err := controlService(serviceName, svc.Stop, svc.Stopped); err != nil &&
!strings.Contains(err.Error(), "service has not been started") {
return err
}
return StartService(serviceName)