perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all: Revert the underscore sillyness

Browse Source
This commit is contained in:
Jakob Borg
2019-02-02 12:16:27 +01:00
parent 9fd270d78e
commit c2ddc83509
70 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/syncthing/monitor.go
View File

@@ -127,13 +127,13 @@ func monitorMain(runtimeOptions RuntimeOptions) {
select {
case s := <-stopSign:
l.Infof("Signal %d received; exiting", s)
_ = cmd.Process.Signal(sigTerm)
cmd.Process.Signal(sigTerm)
<-exit
return
case s := <-restartSign:
l.Infof("Signal %d received; restarting", s)
_ = cmd.Process.Signal(sigHup)
cmd.Process.Signal(sigHup)
err = <-exit
case err = <-exit:
@@ -179,7 +179,7 @@ func copyStderr(stderr io.Reader, dst io.Writer) {
}
if panicFd == nil {
_, _ = dst.Write([]byte(line))
dst.Write([]byte(line))
if strings.Contains(line, "SIGILL") {
l.Warnln(`
@@ -226,20 +226,20 @@ func copyStderr(stderr io.Reader, dst io.Writer) {
stdoutMut.Lock()
for _, line := range stdoutFirstLines {
_, _ = panicFd.WriteString(line)
panicFd.WriteString(line)
}
_, _ = panicFd.WriteString("...\n")
panicFd.WriteString("...\n")
for _, line := range stdoutLastLines {
_, _ = panicFd.WriteString(line)
panicFd.WriteString(line)
}
stdoutMut.Unlock()
}
_, _ = panicFd.WriteString("Panic at " + time.Now().Format(time.RFC3339) + "\n")
panicFd.WriteString("Panic at " + time.Now().Format(time.RFC3339) + "\n")
}
if panicFd != nil {
_, _ = panicFd.WriteString(line)
panicFd.WriteString(line)
}
}
}
@@ -263,7 +263,7 @@ func copyStdout(stdout io.Reader, dst io.Writer) {
}
stdoutMut.Unlock()
_, _ = dst.Write([]byte(line))
dst.Write([]byte(line))
}
}