diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-23 22:10:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 22:10:03 +0100 |
| commit | 3825db5aee1afee1dfd06ad9e29f216110396d6f (patch) | |
| tree | e5af3145b1506aead8539f37eae994c2fed785e1 /cmd/podman/main.go | |
| parent | 0969d725a3b302d9baa0616a204f7fc824404973 (diff) | |
| parent | 6208d534645648ccee0e136b0e659cee1c26ab78 (diff) | |
| download | podman-3825db5aee1afee1dfd06ad9e29f216110396d6f.tar.gz podman-3825db5aee1afee1dfd06ad9e29f216110396d6f.tar.bz2 podman-3825db5aee1afee1dfd06ad9e29f216110396d6f.zip | |
Merge pull request #2404 from baude/remoteerrors
make remote-client error messaging more robust
Diffstat (limited to 'cmd/podman/main.go')
| -rw-r--r-- | cmd/podman/main.go | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index bb21f2f79..19bdb40d6 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -2,11 +2,9 @@ package main import ( "context" - "fmt" "io" "log/syslog" "os" - "os/exec" "runtime/pprof" "strings" "syscall" @@ -18,7 +16,7 @@ import ( "github.com/containers/libpod/pkg/tracing" "github.com/containers/libpod/version" "github.com/containers/storage/pkg/reexec" - opentracing "github.com/opentracing/opentracing-go" + "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" lsyslog "github.com/sirupsen/logrus/hooks/syslog" @@ -224,16 +222,7 @@ func main() { return } if err := rootCmd.Execute(); err != nil { - if MainGlobalOpts.LogLevel == "debug" { - logrus.Errorf(err.Error()) - } else { - if ee, ok := err.(*exec.ExitError); ok { - if status, ok := ee.Sys().(syscall.WaitStatus); ok { - exitCode = status.ExitStatus() - } - } - fmt.Fprintln(os.Stderr, "Error:", err.Error()) - } + outputError(err) } else { // The exitCode modified from 125, indicates an application // running inside of a container failed, as opposed to the |