summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-06-26 11:24:38 +0200
committerJakob Borg <jakob@nym.se>2014-06-26 11:29:41 +0200
commita2da31056b3ef6d619feb542552c0c82274a50eb (patch)
treebe5e5032f5e7eccda30a209431fff4afe4663700 /cmd
parent2383579a6457ce8763e904f0f3e36fb507d0aaf4 (diff)
Increase deadlock timeout, make configurable (fixes #389, fixes #393)v0.8.17
Diffstat (limited to 'cmd')
-rw-r--r--cmd/syncthing/main.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 0efa8afb12..d5fc32aae9 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -115,7 +115,9 @@ The following enviroment variables are interpreted by syncthing:
STCPUPROFILE Write CPU profile to the specified file.
- STGUIASSETS Directory to load GUI assets from. Overrides compiled in assets.`
+ STGUIASSETS Directory to load GUI assets from. Overrides compiled in assets.
+
+ STDEADLOCKTIMEOUT Alter deadlock detection timeout (seconds; default 1200).`
)
func init() {