forked from rook/rook
Sébastien Han
2d75135579
Somehow the combined output does not contain the stderr in the errorn only in the buffer. For example: err = "error exit 1" buf = "Error EBUSY: not enough monitors would be available () after stopping mons [a]" So we now embed the buf in the error so that the caller does not need to print the buffer as well as the error. Also, the caller can more easily decide to ignore the error by instropecting the string. Signed-off-by: Sébastien Han <seb@redhat.com>
50 lines
1.1 KiB
Go
50 lines
1.1 KiB
Go
/*
|
|
Copyright 2016 The Rook Authors. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
// Package exec embeds Rook's exec logic
|
|
package exec
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
"syscall"
|
|
)
|
|
|
|
// CephCLIError is Ceph CLI Error type
|
|
type CephCLIError struct {
|
|
err error
|
|
output string
|
|
}
|
|
|
|
func (e *CephCLIError) Error() string {
|
|
return fmt.Sprintf("%v", e.output)
|
|
}
|
|
|
|
// ExitStatus looks for the exec error code
|
|
func ExitStatus(err error) (int, bool) {
|
|
switch e := err.(type) {
|
|
case *exec.ExitError:
|
|
waitStatus, ok := e.ProcessState.Sys().(syscall.WaitStatus)
|
|
if ok {
|
|
return waitStatus.ExitStatus(), true
|
|
}
|
|
|
|
case *CephCLIError:
|
|
return ExitStatus(e.err)
|
|
}
|
|
return 0, false
|
|
}
|