From 4bf70317ed3c2467f444eac9b7865b170da6366c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 1 Apr 2014 13:33:46 -0600 Subject: [PATCH] Simplify the kill "SIG" prefix stripping code Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- server/server.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index bcaaad742..96a37527c 100644 --- a/server/server.go +++ b/server/server.go @@ -142,12 +142,8 @@ func (srv *Server) ContainerKill(job *engine.Job) engine.Status { // The largest legal signal is 31, so let's parse on 5 bits sig, err = strconv.ParseUint(job.Args[1], 10, 5) if err != nil { - // The signal is not a number, treat it as a string - sig = uint64(signal.SignalMap[job.Args[1]]) - if sig == 0 && strings.HasPrefix(job.Args[1], "SIG") { - // If signal is prefixed with SIG, try with it stripped (ie, "SIGKILL", etc) - sig = uint64(signal.SignalMap[job.Args[1][3:]]) - } + // The signal is not a number, treat it as a string (either like "KILL" or like "SIGKILL") + sig = uint64(signal.SignalMap[strings.TrimPrefix(job.Args[1], "SIG")]) if sig == 0 { return job.Errorf("Invalid signal: %s", job.Args[1]) }