Added error string for process operations

rajasec · rajasec · commit 298cd1b28564 · 2016-02-04T11:54:50.000+05:30
Signed-off-by: rajasec &lt;rajasec79@gmail.com&gt;

Changing the error code string name as per review comments

Signed-off-by: rajasec &lt;rajasec79@gmail.com&gt;
diff --git a/libcontainer/error.go b/libcontainer/error.go
@@ -19,7 +19,7 @@ const (
 	ContainerNotPaused
 
 	// Process errors
-	ProcessNotExecuted
+	NoProcessOps
 
 	// Common errors
 	ConfigInvalid
@@ -49,6 +49,8 @@ func (c ErrorCode) String() string {
 		return "Console exists for process"
 	case ContainerNotPaused:
 		return "Container is not paused"
+	case NoProcessOps:
+		return "No process operations"
 	default:
 		return "Unknown error"
 	}
diff --git a/libcontainer/process.go b/libcontainer/process.go
@@ -55,7 +55,7 @@ type Process struct {
 // Wait releases any resources associated with the Process
 func (p Process) Wait() (*os.ProcessState, error) {
 	if p.ops == nil {
-		return nil, newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)
+		return nil, newGenericError(fmt.Errorf("invalid process"), NoProcessOps)
 	}
 	return p.ops.wait()
 }
@@ -65,15 +65,15 @@ func (p Process) Pid() (int, error) {
 	// math.MinInt32 is returned here, because it's invalid value
 	// for the kill() system call.
 	if p.ops == nil {
-		return math.MinInt32, newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)
+		return math.MinInt32, newGenericError(fmt.Errorf("invalid process"), NoProcessOps)
 	}
 	return p.ops.pid(), nil
 }
 
 // Signal sends a signal to the Process.
 func (p Process) Signal(sig os.Signal) error {
 	if p.ops == nil {
-		return newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)
+		return newGenericError(fmt.Errorf("invalid process"), NoProcessOps)
 	}
 	return p.ops.signal(sig)
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ type Process struct {`
`55`	`55`	`// Wait releases any resources associated with the Process`
`56`	`56`	`func (p Process) Wait() (*os.ProcessState, error) {`
`57`	`57`	`if p.ops == nil {`
`58`		`- return nil, newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)`
	`58`	`+ return nil, newGenericError(fmt.Errorf("invalid process"), NoProcessOps)`
`59`	`59`	`}`
`60`	`60`	`return p.ops.wait()`
`61`	`61`	`}`
`@@ -65,15 +65,15 @@ func (p Process) Pid() (int, error) {`
`65`	`65`	`// math.MinInt32 is returned here, because it's invalid value`
`66`	`66`	`// for the kill() system call.`
`67`	`67`	`if p.ops == nil {`
`68`		`- return math.MinInt32, newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)`
	`68`	`+ return math.MinInt32, newGenericError(fmt.Errorf("invalid process"), NoProcessOps)`
`69`	`69`	`}`
`70`	`70`	`return p.ops.pid(), nil`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Signal sends a signal to the Process.`
`74`	`74`	`func (p Process) Signal(sig os.Signal) error {`
`75`	`75`	`if p.ops == nil {`
`76`		`- return newGenericError(fmt.Errorf("invalid process"), ProcessNotExecuted)`
	`76`	`+ return newGenericError(fmt.Errorf("invalid process"), NoProcessOps)`
`77`	`77`	`}`
`78`	`78`	`return p.ops.signal(sig)`
`79`	`79`	`}`