Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1029 from kozec/master 

Add STNOUPGRADE environment variable to prevents autoupgrades
This commit is contained in:
Jakob Borg 2014-11-26 23:25:45 +01:00
parent 34cb305755 b84d960a81
commit decf16b92c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/syncthing/main.go
View File

@ -171,6 +171,8 @@ are mostly useful for developers. Use with care.
STPERFSTATS Write running performance statistics to perf-$pid.csv. Not STPERFSTATS Write running performance statistics to perf-$pid.csv. Not
supported on Windows. supported on Windows.
STNOUPGRADE Disable automatic upgrades.
GOMAXPROCS Set the maximum number of CPU cores to use. Defaults to all GOMAXPROCS Set the maximum number of CPU cores to use. Defaults to all
available CPU cores.` available CPU cores.`
) )
@ -189,6 +191,7 @@ var (
generateDir string generateDir string
logFile string logFile string
noRestart = os.Getenv("STNORESTART") != "" noRestart = os.Getenv("STNORESTART") != ""
noUpgrade = os.Getenv("STNOUPGRADE") != ""
guiAddress = os.Getenv("STGUIADDRESS") // legacy guiAddress = os.Getenv("STGUIADDRESS") // legacy
guiAuthentication = os.Getenv("STGUIAUTH") // legacy guiAuthentication = os.Getenv("STGUIAUTH") // legacy
guiAPIKey = os.Getenv("STGUIAPIKEY") // legacy guiAPIKey = os.Getenv("STGUIAPIKEY") // legacy
@ -571,7 +574,9 @@ func syncthingMain() {
} }
if opts.AutoUpgradeIntervalH > 0 { if opts.AutoUpgradeIntervalH > 0 {
if IsRelease { if noUpgrade {
l.Infof("No automatic upgrades; STNOUPGRADE environment variable defined.")
} else if IsRelease {
go autoUpgrade() go autoUpgrade()
} else { } else {
l.Infof("No automatic upgrades; %s is not a relase version.", Version) l.Infof("No automatic upgrades; %s is not a relase version.", Version)