-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement visor restart from hypervisor
- Loading branch information
1 parent
f8c40e7
commit 95425b7
Showing
7 changed files
with
201 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| package restart | ||
|
|
||
| import ( | ||
| "errors" | ||
| "log" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "time" | ||
|
|
||
| "github.com/SkycoinProject/skycoin/src/util/logging" | ||
| ) | ||
|
|
||
| var ( | ||
| // ErrMalformedArgs is returned when executable args are malformed. | ||
| ErrMalformedArgs = errors.New("malformed args") | ||
| ) | ||
|
|
||
| const defaultCheckDelay = 5 * time.Second | ||
|
|
||
| // Context describes data required for restarting visor. | ||
| type Context struct { | ||
| log *logging.Logger | ||
| checkDelay time.Duration | ||
| workingDirectory string | ||
| args []string | ||
| } | ||
|
|
||
| // CaptureContext captures data required for restarting visor. | ||
| // Data used by CaptureContext must not be modified before, | ||
| // therefore calling CaptureContext immediately after starting executable is recommended. | ||
| func CaptureContext() (*Context, error) { | ||
| wd, err := os.Getwd() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| args := os.Args | ||
|
|
||
| context := &Context{ | ||
| checkDelay: defaultCheckDelay, | ||
| workingDirectory: wd, | ||
| args: args, | ||
| } | ||
|
|
||
| return context, nil | ||
| } | ||
|
|
||
| // RegisterLogger registers a logger instead of standard one. | ||
| func (c *Context) RegisterLogger(logger *logging.Logger) { | ||
| c.log = logger | ||
| } | ||
|
|
||
| // SetCheckDelay sets a check delay instead of standard one. | ||
| func (c *Context) SetCheckDelay(delay time.Duration) { | ||
| c.checkDelay = delay | ||
| } | ||
|
|
||
| // Restart restarts executable using Context. | ||
| // Should not be called from a goroutine. | ||
| func (c *Context) Restart() error { | ||
| if len(c.args) == 0 { | ||
| return ErrMalformedArgs | ||
| } | ||
|
|
||
| executableRelPath := c.args[0] | ||
| executableAbsPath := filepath.Join(c.workingDirectory, executableRelPath) | ||
|
|
||
| c.infoLogger()("Starting new instance of executable (path: %q)", executableAbsPath) | ||
|
|
||
| errCh := c.start(executableAbsPath) | ||
|
|
||
| ticker := time.NewTicker(c.checkDelay) | ||
| defer ticker.Stop() | ||
|
|
||
| select { | ||
| case err := <-errCh: | ||
| c.errorLogger()("Failed to start new instance: %v", err) | ||
| return err | ||
| case <-ticker.C: | ||
| c.infoLogger()("New instance started successfully, exiting") | ||
| os.Exit(0) | ||
|
|
||
| // unreachable | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (c *Context) start(path string) chan error { | ||
| errCh := make(chan error, 1) | ||
|
|
||
| go func(path string) { | ||
| normalizedPath, err := exec.LookPath(path) | ||
| if err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
|
|
||
| if len(c.args) == 0 { | ||
| errCh <- ErrMalformedArgs | ||
| return | ||
| } | ||
|
|
||
| args := c.args[1:] | ||
| cmd := exec.Command(normalizedPath, args...) | ||
|
|
||
| if err := cmd.Start(); err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
|
|
||
| if err := cmd.Wait(); err != nil { | ||
| errCh <- err | ||
| return | ||
| } | ||
| }(path) | ||
|
|
||
| return errCh | ||
| } | ||
|
|
||
| func (c *Context) infoLogger() func(string, ...interface{}) { | ||
| if c.log != nil { | ||
| return c.log.Infof | ||
| } | ||
|
|
||
| logger := log.New(os.Stdout, "[INFO] ", log.LstdFlags) | ||
|
|
||
| return logger.Printf | ||
| } | ||
|
|
||
| func (c *Context) errorLogger() func(string, ...interface{}) { | ||
| if c.log != nil { | ||
| return c.log.Errorf | ||
| } | ||
|
|
||
| logger := log.New(os.Stdout, "[ERROR] ", log.LstdFlags) | ||
|
|
||
| return logger.Printf | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters