mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
a793564b25
Moving all strings to the errors package wasn't a good idea after all. Our custom implementation of Go errors predates everything that's nice and good about working with errors in Go. Take as an example what we have to do to get an error message: ```go func GetErrorMessage(err error) string { switch err.(type) { case errcode.Error: e, _ := err.(errcode.Error) return e.Message case errcode.ErrorCode: ec, _ := err.(errcode.ErrorCode) return ec.Message() default: return err.Error() } } ``` This goes against every good practice for Go development. The language already provides a simple, intuitive and standard way to get error messages, that is calling the `Error()` method from an error. Reinventing the error interface is a mistake. Our custom implementation also makes very hard to reason about errors, another nice thing about Go. I found several (>10) error declarations that we don't use anywhere. This is a clear sign about how little we know about the errors we return. I also found several error usages where the number of arguments was different than the parameters declared in the error, another clear example of how difficult is to reason about errors. Moreover, our custom implementation didn't really make easier for people to return custom HTTP status code depending on the errors. Again, it's hard to reason about when to set custom codes and how. Take an example what we have to do to extract the message and status code from an error before returning a response from the API: ```go switch err.(type) { case errcode.ErrorCode: daError, _ := err.(errcode.ErrorCode) statusCode = daError.Descriptor().HTTPStatusCode errMsg = daError.Message() case errcode.Error: // For reference, if you're looking for a particular error // then you can do something like : // import ( derr "github.com/docker/docker/errors" ) // if daError.ErrorCode() == derr.ErrorCodeNoSuchContainer { ... } daError, _ := err.(errcode.Error) statusCode = daError.ErrorCode().Descriptor().HTTPStatusCode errMsg = daError.Message default: // This part of will be removed once we've // converted everything over to use the errcode package // FIXME: this is brittle and should not be necessary. // If we need to differentiate between different possible error types, // we should create appropriate error types with clearly defined meaning errStr := strings.ToLower(err.Error()) for keyword, status := range map[string]int{ "not found": http.StatusNotFound, "no such": http.StatusNotFound, "bad parameter": http.StatusBadRequest, "conflict": http.StatusConflict, "impossible": http.StatusNotAcceptable, "wrong login/password": http.StatusUnauthorized, "hasn't been activated": http.StatusForbidden, } { if strings.Contains(errStr, keyword) { statusCode = status break } } } ``` You can notice two things in that code: 1. We have to explain how errors work, because our implementation goes against how easy to use Go errors are. 2. At no moment we arrived to remove that `switch` statement that was the original reason to use our custom implementation. This change removes all our status errors from the errors package and puts them back in their specific contexts. IT puts the messages back with their contexts. That way, we know right away when errors used and how to generate their messages. It uses custom interfaces to reason about errors. Errors that need to response with a custom status code MUST implementent this simple interface: ```go type errorWithStatus interface { HTTPErrorStatusCode() int } ``` This interface is very straightforward to implement. It also preserves Go errors real behavior, getting the message is as simple as using the `Error()` method. I included helper functions to generate errors that use custom status code in `errors/errors.go`. By doing this, we remove the hard dependency we have eeverywhere to our custom errors package. Yes, you can use it as a helper to generate error, but it's still very easy to generate errors without it. Please, read this fantastic blog post about errors in Go: http://dave.cheney.net/2014/12/24/inspecting-errors Signed-off-by: David Calavera <david.calavera@gmail.com>
122 lines
2.7 KiB
Go
122 lines
2.7 KiB
Go
package exec
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/docker/docker/daemon/execdriver"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/runconfig"
|
|
)
|
|
|
|
// Config holds the configurations for execs. The Daemon keeps
|
|
// track of both running and finished execs so that they can be
|
|
// examined both during and after completion.
|
|
type Config struct {
|
|
sync.Mutex
|
|
*runconfig.StreamConfig
|
|
ID string
|
|
Running bool
|
|
ExitCode *int
|
|
ProcessConfig *execdriver.ProcessConfig
|
|
OpenStdin bool
|
|
OpenStderr bool
|
|
OpenStdout bool
|
|
CanRemove bool
|
|
ContainerID string
|
|
DetachKeys []byte
|
|
|
|
// waitStart will be closed immediately after the exec is really started.
|
|
waitStart chan struct{}
|
|
}
|
|
|
|
// NewConfig initializes the a new exec configuration
|
|
func NewConfig() *Config {
|
|
return &Config{
|
|
ID: stringid.GenerateNonCryptoID(),
|
|
StreamConfig: runconfig.NewStreamConfig(),
|
|
waitStart: make(chan struct{}),
|
|
}
|
|
}
|
|
|
|
// Store keeps track of the exec configurations.
|
|
type Store struct {
|
|
commands map[string]*Config
|
|
sync.RWMutex
|
|
}
|
|
|
|
// NewStore initializes a new exec store.
|
|
func NewStore() *Store {
|
|
return &Store{commands: make(map[string]*Config, 0)}
|
|
}
|
|
|
|
// Commands returns the exec configurations in the store.
|
|
func (e *Store) Commands() map[string]*Config {
|
|
e.RLock()
|
|
commands := make(map[string]*Config, len(e.commands))
|
|
for id, config := range e.commands {
|
|
commands[id] = config
|
|
}
|
|
e.RUnlock()
|
|
return commands
|
|
}
|
|
|
|
// Add adds a new exec configuration to the store.
|
|
func (e *Store) Add(id string, Config *Config) {
|
|
e.Lock()
|
|
e.commands[id] = Config
|
|
e.Unlock()
|
|
}
|
|
|
|
// Get returns an exec configuration by its id.
|
|
func (e *Store) Get(id string) *Config {
|
|
e.RLock()
|
|
res := e.commands[id]
|
|
e.RUnlock()
|
|
return res
|
|
}
|
|
|
|
// Delete removes an exec configuration from the store.
|
|
func (e *Store) Delete(id string) {
|
|
e.Lock()
|
|
delete(e.commands, id)
|
|
e.Unlock()
|
|
}
|
|
|
|
// List returns the list of exec ids in the store.
|
|
func (e *Store) List() []string {
|
|
var IDs []string
|
|
e.RLock()
|
|
for id := range e.commands {
|
|
IDs = append(IDs, id)
|
|
}
|
|
e.RUnlock()
|
|
return IDs
|
|
}
|
|
|
|
// Wait waits until the exec process finishes or there is an error in the error channel.
|
|
func (c *Config) Wait(cErr chan error) error {
|
|
// Exec should not return until the process is actually running
|
|
select {
|
|
case <-c.waitStart:
|
|
case err := <-cErr:
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Close closes the wait channel for the progress.
|
|
func (c *Config) Close() {
|
|
close(c.waitStart)
|
|
}
|
|
|
|
// Resize changes the size of the terminal for the exec process.
|
|
func (c *Config) Resize(h, w int) error {
|
|
select {
|
|
case <-c.waitStart:
|
|
case <-time.After(time.Second):
|
|
return fmt.Errorf("Exec %s is not running, so it can not be resized.", c.ID)
|
|
}
|
|
return c.ProcessConfig.Terminal.Resize(h, w)
|
|
}
|