octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-03 12:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2690 from calmh/fix2665

Browse Source 
Always run relaying when enabled (fixes #2665)
This commit is contained in:
Audrius Butkevicius 2016-01-12 13:48:22 +00:00
commit 5fa8b42fac
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/syncthing/main.go
View File

@ -738,7 +738,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
// Start relay management // Start relay management
var relayService *relay.Service var relayService *relay.Service
if opts.RelaysEnabled && (opts.GlobalAnnEnabled || opts.RelayWithoutGlobalAnn) { if opts.RelaysEnabled {
relayService = relay.NewService(cfg, tlsCfg) relayService = relay.NewService(cfg, tlsCfg)
mainService.Add(relayService) mainService.Add(relayService)
} }

2
lib/config/config_test.go
View File

@ -43,7 +43,6 @@ func TestDefaultValues(t *testing.T) {
ReconnectIntervalS: 60, ReconnectIntervalS: 60,
RelaysEnabled: true, RelaysEnabled: true,
RelayReconnectIntervalM: 10, RelayReconnectIntervalM: 10,
RelayWithoutGlobalAnn: false,
StartBrowser: true, StartBrowser: true,
UPnPEnabled: true, UPnPEnabled: true,
UPnPLeaseM: 60, UPnPLeaseM: 60,
@ -173,7 +172,6 @@ func TestOverriddenValues(t *testing.T) {
ReconnectIntervalS: 6000, ReconnectIntervalS: 6000,
RelaysEnabled: false, RelaysEnabled: false,
RelayReconnectIntervalM: 20, RelayReconnectIntervalM: 20,
RelayWithoutGlobalAnn: true,
StartBrowser: false, StartBrowser: false,
UPnPEnabled: false, UPnPEnabled: false,
UPnPLeaseM: 90, UPnPLeaseM: 90,

1
lib/config/optionsconfiguration.go
View File

@ -19,7 +19,6 @@ type OptionsConfiguration struct {
ReconnectIntervalS int `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"` ReconnectIntervalS int `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"`
RelaysEnabled bool `xml:"relaysEnabled" json:"relaysEnabled" default:"true"` RelaysEnabled bool `xml:"relaysEnabled" json:"relaysEnabled" default:"true"`
RelayReconnectIntervalM int `xml:"relayReconnectIntervalM" json:"relayReconnectIntervalM" default:"10"` RelayReconnectIntervalM int `xml:"relayReconnectIntervalM" json:"relayReconnectIntervalM" default:"10"`
RelayWithoutGlobalAnn bool `xml:"relayWithoutGlobalAnn" json:"relayWithoutGlobalAnn" default:"false"`
StartBrowser bool `xml:"startBrowser" json:"startBrowser" default:"true"` StartBrowser bool `xml:"startBrowser" json:"startBrowser" default:"true"`
UPnPEnabled bool `xml:"upnpEnabled" json:"upnpEnabled" default:"true"` UPnPEnabled bool `xml:"upnpEnabled" json:"upnpEnabled" default:"true"`
UPnPLeaseM int `xml:"upnpLeaseMinutes" json:"upnpLeaseMinutes" default:"60"` UPnPLeaseM int `xml:"upnpLeaseMinutes" json:"upnpLeaseMinutes" default:"60"`