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

Remove restart from environment, handle at a server level; also fix pre-boot logic

Browse Source
This commit is contained in:
Dane Everitt
2020-08-13 21:36:23 -07:00
parent 63c09adaa1
commit a24a5466e5
3 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
environment/docker/power.go
View File

@@ -128,29 +128,6 @@ func (e *Environment) Start() error {
return e.Attach()
}
// Restarts the server process by waiting for the process to gracefully stop and then triggering a
// start command. This works identially to how
func (e *Environment) Restart(seconds uint, terminate bool) error {
// Only try to wait for stop if the process is currently running, otherwise just skip right to the
// start event.
if r, _ := e.IsRunning(); !r {
if err := e.WaitForStop(seconds, terminate); 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
}
}
// Start the process.
return e.Start()
}
// Stops the container that the server is running in. This will allow up to 30 seconds to pass
// before the container is forcefully terminated if we are trying to stop it without using a command
// sent into the instance.

6
environment/environment.go
View File

@@ -47,12 +47,6 @@ type ProcessEnvironment interface {
// not be returned.
Stop() error
// Restart a server instance. If already stopped the process will be started. Pass the number
// of seconds to wait for the server to stop, and wether or not the process should be terminated
// if not stopped within that time period. If you pass "false" as the terminate option the server
// will not be started but the lock on the process will be released.
Restart(seconds uint, terminate bool) error
// Waits for a server instance to stop gracefully. If the server is still detected
// as running after seconds, an error will be returned, or the server will be terminated
// depending on the value of the second argument.