MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle restarting correctly, ensure power state propagates correctly

Browse Source
This commit is contained in:
Dane Everitt
2020-08-18 20:43:28 -07:00
parent b4875926c6
commit 956e87eb93
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/power.go
View File

@@ -95,22 +95,18 @@ func (s *Server) HandlePowerAction(action PowerAction, waitSeconds ...int) error
case PowerActionStop:
// We're specificially waiting for the process to be stopped here, otherwise the lock is released
// too soon, and you can rack up all sorts of issues.
return s.Environment.WaitForStop(10 * 60, true)
return s.Environment.WaitForStop(10*60, true)
case PowerActionRestart:
// Only try to wait for stop if the process is currently running, otherwise just skip right to the
// start event.
if r, _ := s.Environment.IsRunning(); !r {
if err := s.Environment.WaitForStop(10 * 60, true); err != nil {
// Even timeout errors should be bubbled back up the stack. If the process didn't stop
// nicely, but the terminate argument was passed then the server is stopped without an
// error being returned.
//
// However, if terminate is not passed you'll get a context deadline error. We could
// probably handle that nicely here, but I'd rather just pass it back up the stack for now.
// Either way, any type of error indicates we should not attempt to start the server back
// up.
return err
}
if err := s.Environment.WaitForStop(10*60, true); err != nil {
// Even timeout errors should be bubbled back up the stack. If the process didn't stop
// nicely, but the terminate argument was passed then the server is stopped without an
// error being returned.
//
// However, if terminate is not passed you'll get a context deadline error. We could
// probably handle that nicely here, but I'd rather just pass it back up the stack for now.
// Either way, any type of error indicates we should not attempt to start the server back
// up.
return err
}
// Now actually try to start the process by executing the normal pre-boot logic.
@@ -158,4 +154,4 @@ func (s *Server) onBeforeStart() error {
}
return nil
}
}