您最多选择25个主题
主题必须以字母或数字开头，可以包含连字符 (-)，并且长度不得超过35个字符
50 行
1.8 KiB
50 行
1.8 KiB
Index: src/github.com/ochinchina/supervisord/rlimit.go |
|
--- src/github.com/ochinchina/supervisord/rlimit.go.orig 2021-02-27 09:35:44.000000000 +0100 |
|
+++ src/github.com/ochinchina/supervisord/rlimit.go 2021-02-27 09:37:13.319839000 +0100 |
|
@@ -40,11 +40,11 @@ |
|
return fmt.Errorf("fail to get the %s limit", resourceName) |
|
} |
|
|
|
- if minRequiredSource > limit.Max { |
|
+ if minRequiredSource > uint64(limit.Max) { |
|
return fmt.Errorf("%s %d is greater than Hard limit %d", resourceName, minRequiredSource, limit.Max) |
|
} |
|
|
|
- if limit.Cur >= minRequiredSource { |
|
+ if uint64(limit.Cur) >= minRequiredSource { |
|
return nil |
|
} |
|
|
|
Index: src/github.com/ochinchina/supervisord/signals/signal.go |
|
--- src/github.com/ochinchina/supervisord/signals/signal.go.orig 2021-02-27 09:35:44.000000000 +0100 |
|
+++ src/github.com/ochinchina/supervisord/signals/signal.go 2021-02-27 09:39:43.289516000 +0100 |
|
@@ -12,8 +12,6 @@ |
|
var signalMap = map[string]os.Signal{"SIGABRT": syscall.SIGABRT, |
|
"SIGALRM": syscall.SIGALRM, |
|
"SIGBUS": syscall.SIGBUS, |
|
- "SIGCHLD": syscall.SIGCHLD, |
|
- "SIGCLD": syscall.SIGCLD, |
|
"SIGCONT": syscall.SIGCONT, |
|
"SIGFPE": syscall.SIGFPE, |
|
"SIGHUP": syscall.SIGHUP, |
|
@@ -23,12 +21,9 @@ |
|
"SIGIOT": syscall.SIGIOT, |
|
"SIGKILL": syscall.SIGKILL, |
|
"SIGPIPE": syscall.SIGPIPE, |
|
- "SIGPOLL": syscall.SIGPOLL, |
|
"SIGPROF": syscall.SIGPROF, |
|
- "SIGPWR": syscall.SIGPWR, |
|
"SIGQUIT": syscall.SIGQUIT, |
|
"SIGSEGV": syscall.SIGSEGV, |
|
- "SIGSTKFLT": syscall.SIGSTKFLT, |
|
"SIGSTOP": syscall.SIGSTOP, |
|
"SIGSYS": syscall.SIGSYS, |
|
"SIGTERM": syscall.SIGTERM, |
|
@@ -36,7 +31,6 @@ |
|
"SIGTSTP": syscall.SIGTSTP, |
|
"SIGTTIN": syscall.SIGTTIN, |
|
"SIGTTOU": syscall.SIGTTOU, |
|
- "SIGUNUSED": syscall.SIGUNUSED, |
|
"SIGURG": syscall.SIGURG, |
|
"SIGUSR1": syscall.SIGUSR1, |
|
"SIGUSR2": syscall.SIGUSR2,
|
|
|