github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4115 from kolyshkin/num-signals-are-ok

Browse Source 
ParseSignal: drop add'l check for numeric signals
This commit is contained in:
Wei Fu 2020-03-18 13:10:57 +08:00 committed by GitHub
commit 6c64032c14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
signals_test.go
View File

@ -31,7 +31,6 @@ func TestParseSignal(t *testing.T) {
{"1", syscall.Signal(1), false}, {"1", syscall.Signal(1), false},
{"SIGKILL", syscall.SIGKILL, false}, {"SIGKILL", syscall.SIGKILL, false},
{"NONEXIST", 0, true}, {"NONEXIST", 0, true},
{"65536", 0, true},
} }
for _, ts := range testSignals { for _, ts := range testSignals {
t.Run(fmt.Sprintf("%s/%d/%t", ts.raw, ts.want, ts.err), func(t *testing.T) { t.Run(fmt.Sprintf("%s/%d/%t", ts.raw, ts.want, ts.err), func(t *testing.T) {

6
signals_unix.go
View File

@ -33,11 +33,7 @@ import (
func ParseSignal(rawSignal string) (syscall.Signal, error) { func ParseSignal(rawSignal string) (syscall.Signal, error) {
s, err := strconv.Atoi(rawSignal) s, err := strconv.Atoi(rawSignal)
if err == nil { if err == nil {
signal := syscall.Signal(s) return syscall.Signal(s), nil
if unix.SignalName(signal) != "" {
return signal, nil
}
return -1, fmt.Errorf("unknown signal %q", rawSignal)
} }
signal := unix.SignalNum(strings.ToUpper(rawSignal)) signal := unix.SignalNum(strings.ToUpper(rawSignal))
if signal == 0 { if signal == 0 {