diff options
Diffstat (limited to 'lib/syncthing/syncthing.go')
| -rw-r--r-- | lib/syncthing/syncthing.go | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/syncthing/syncthing.go b/lib/syncthing/syncthing.go index be65f83cd4..2371315217 100644 --- a/lib/syncthing/syncthing.go +++ b/lib/syncthing/syncthing.go @@ -54,12 +54,11 @@ const ( ) type Options struct { - AuditWriter io.Writer - DeadlockTimeoutS int - NoUpgrade bool - ProfilerAddr string - ResetDeltaIdxs bool - Verbose bool + AuditWriter io.Writer + NoUpgrade bool + ProfilerAddr string + ResetDeltaIdxs bool + Verbose bool // null duration means use default value DBRecheckInterval time.Duration DBIndirectGCInterval time.Duration @@ -251,12 +250,6 @@ func (a *App) startup() error { keyGen := protocol.NewKeyGenerator() m := model.NewModel(a.cfg, a.myID, a.ll, protectedFiles, a.evLogger, keyGen) - if a.opts.DeadlockTimeoutS > 0 { - m.StartDeadlockDetector(time.Duration(a.opts.DeadlockTimeoutS) * time.Second) - } else if !build.IsRelease || build.IsBeta { - m.StartDeadlockDetector(20 * time.Minute) - } - a.mainService.Add(m) // The TLS configuration is used for both the listening socket and outgoing |