octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-19 19:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/syncthing: Handle -logfile again (fixes #3931)

Browse Source 
The monitor process should not set STNORESTART as this indicates the
intention from the user. Setting STMONITORED is enough, as this tells
the next Syncthing instance that it is running under the monitor
process.

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3932
This commit is contained in:
Jakob Borg 2017-01-25 07:33:35 +00:00
parent ddca8d91fa
commit 22a4d49ed0
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/main.go
View File

@ -401,7 +401,7 @@ func main() {
return return
} }
if options.noRestart { if innerProcess || options.noRestart {
syncthingMain(options) syncthingMain(options)
} else { } else {
monitorMain(options) monitorMain(options)

1
cmd/syncthing/monitor.go
View File

@ -35,7 +35,6 @@ const (
) )
func monitorMain(runtimeOptions RuntimeOptions) { func monitorMain(runtimeOptions RuntimeOptions) {
os.Setenv("STNORESTART", "yes")
os.Setenv("STMONITORED", "yes") os.Setenv("STMONITORED", "yes")
l.SetPrefix("[monitor] ") l.SetPrefix("[monitor] ")