aboutsummaryrefslogtreecommitdiff
path: root/modules/process/manager.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-11-30 20:46:19 -0500
committerUnknwon <u@gogs.io>2015-11-30 20:46:19 -0500
commitdcb391d3415a84ec893d11b788f776ea89c301c3 (patch)
treed83263075dbbe416cc79691fd87cc1255226ddf5 /modules/process/manager.go
parent5a14c3cf9854b2762a82ef6bdd781810380ab666 (diff)
parent830d00066785d131413d1de11ce301bf1f0b818a (diff)
Merge branch 'feature/wiki' into develop
Diffstat (limited to 'modules/process/manager.go')
-rw-r--r--modules/process/manager.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/process/manager.go b/modules/process/manager.go
index 68c33315..1f98ca7c 100644
--- a/modules/process/manager.go
+++ b/modules/process/manager.go
@@ -113,7 +113,8 @@ func Remove(pid int64) {
func Kill(pid int64) error {
for i, proc := range Processes {
if proc.Pid == pid {
- if proc.Cmd.Process != nil && proc.Cmd.ProcessState != nil && !proc.Cmd.ProcessState.Exited() {
+ if proc.Cmd != nil && proc.Cmd.Process != nil &&
+ proc.Cmd.ProcessState != nil && !proc.Cmd.ProcessState.Exited() {
if err := proc.Cmd.Process.Kill(); err != nil {
return fmt.Errorf("fail to kill process(%d/%s): %v", proc.Pid, proc.Description, err)
}