octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-08 14:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/api: Report actual listener address (fixes #6049) (#6060)

Browse Source
This commit is contained in:
Jakob Borg 2019-10-04 12:25:41 +02:00 committed by Audrius Butkevicius
parent 1b5a61e03e
commit 5e31e6356f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/api.go
View File

@ -85,6 +85,7 @@ type service struct {
started chan string // signals startup complete by sending the listener address, for testing only started chan string // signals startup complete by sending the listener address, for testing only
startedOnce chan struct{} // the service has started successfully at least once startedOnce chan struct{} // the service has started successfully at least once
startupErr error startupErr error
listenerAddr net.Addr
guiErrors logger.Recorder guiErrors logger.Recorder
systemLog logger.Recorder systemLog logger.Recorder
@ -222,6 +223,7 @@ func (s *service) serve(stop chan struct{}) {
return return
} }
s.listenerAddr = listener.Addr()
defer listener.Close() defer listener.Close()
s.cfg.Subscribe(s) s.cfg.Subscribe(s)
@ -913,7 +915,7 @@ func (s *service) getSystemStatus(w http.ResponseWriter, r *http.Request) {
res["uptime"] = s.urService.UptimeS() res["uptime"] = s.urService.UptimeS()
res["startTime"] = ur.StartTime res["startTime"] = ur.StartTime
res["guiAddressOverridden"] = s.cfg.GUI().IsOverridden() res["guiAddressOverridden"] = s.cfg.GUI().IsOverridden()
res["guiAddressUsed"] = s.cfg.GUI().Address() res["guiAddressUsed"] = s.listenerAddr.String()
sendJSON(w, res) sendJSON(w, res)
} }