cmd/syncthing: Ensure myID is set by making it local (fixes #5859) (#5862)

This commit is contained in:
Simon Frei
2019-07-17 07:19:14 +02:00
committed by Jakob Borg
parent 0025e9ccfb
commit eed1edcca0
4 changed files with 68 additions and 46 deletions

View File

@@ -20,6 +20,7 @@ import (
"github.com/syncthing/syncthing/lib/locations"
"github.com/syncthing/syncthing/lib/osutil"
"github.com/syncthing/syncthing/lib/protocol"
"github.com/syncthing/syncthing/lib/sync"
)
@@ -448,7 +449,7 @@ func childEnv() []string {
// panicUploadMaxWait uploading panics...
func maybeReportPanics() {
// Try to get a config to see if/where panics should be reported.
cfg, err := loadOrDefaultConfig()
cfg, err := loadOrDefaultConfig(protocol.EmptyDeviceID)
if err != nil {
l.Warnln("Couldn't load config; not reporting crash")
return