cotugno/syncthing
2
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2024-11-16 18:41:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change /rest/system/connections output (fixes #1487)

Browse Source
This commit is contained in:
Audrius Butkevicius 2015-04-07 13:20:40 +01:00
parent 70f4792ab1
commit 8f05b8f982
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/model/model.go
View File

@ -201,7 +201,7 @@ func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
} }
// ConnectionStats returns a map with connection statistics for each connected device. // ConnectionStats returns a map with connection statistics for each connected device.
func (m *Model) ConnectionStats() map[string]ConnectionInfo { func (m *Model) ConnectionStats() map[string]interface{} {
type remoteAddrer interface { type remoteAddrer interface {
RemoteAddr() net.Addr RemoteAddr() net.Addr
} }
@ -209,7 +209,8 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
m.pmut.RLock() m.pmut.RLock()
m.fmut.RLock() m.fmut.RLock()
var res = make(map[string]ConnectionInfo) var res = make(map[string]interface{})
conns := make(map[string]ConnectionInfo, len(m.protoConn))
for device, conn := range m.protoConn { for device, conn := range m.protoConn {
ci := ConnectionInfo{ ci := ConnectionInfo{
Statistics: conn.Statistics(), Statistics: conn.Statistics(),
@ -219,9 +220,11 @@ func (m *Model) ConnectionStats() map[string]ConnectionInfo {
ci.Address = nc.RemoteAddr().String() ci.Address = nc.RemoteAddr().String()
} }
res[device.String()] = ci conns[device.String()] = ci
} }
res["connections"] = conns
m.fmut.RUnlock() m.fmut.RUnlock()
m.pmut.RUnlock() m.pmut.RUnlock()