perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/events, cmd/syncthing: Correct GlobalID in debug and mark "since" parameter optional

Browse Source 
Skip-check: metalint

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4025
This commit is contained in:
Simon Frei 2017-03-07 05:44:47 +00:00 committed by Jakob Borg
parent 689f13f4f1
commit 1c29a93013
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/syncthing/gui.go
View File

@ -234,8 +234,8 @@ func (s *apiService) Serve() {
getRestMux.HandleFunc("/rest/db/need", s.getDBNeed) // folder [perpage] [page] getRestMux.HandleFunc("/rest/db/need", s.getDBNeed) // folder [perpage] [page]
getRestMux.HandleFunc("/rest/db/status", s.getDBStatus) // folder getRestMux.HandleFunc("/rest/db/status", s.getDBStatus) // folder
getRestMux.HandleFunc("/rest/db/browse", s.getDBBrowse) // folder [prefix] [dirsonly] [levels] getRestMux.HandleFunc("/rest/db/browse", s.getDBBrowse) // folder [prefix] [dirsonly] [levels]
getRestMux.HandleFunc("/rest/events", s.getIndexEvents) // since [limit] [timeout] getRestMux.HandleFunc("/rest/events", s.getIndexEvents) // [since] [limit] [timeout]
getRestMux.HandleFunc("/rest/events/disk", s.getDiskEvents) // since [limit] [timeout] getRestMux.HandleFunc("/rest/events/disk", s.getDiskEvents) // [since] [limit] [timeout]
getRestMux.HandleFunc("/rest/stats/device", s.getDeviceStats) // - getRestMux.HandleFunc("/rest/stats/device", s.getDeviceStats) // -
getRestMux.HandleFunc("/rest/stats/folder", s.getFolderStats) // - getRestMux.HandleFunc("/rest/stats/folder", s.getFolderStats) // -
getRestMux.HandleFunc("/rest/svc/deviceid", s.getDeviceID) // id getRestMux.HandleFunc("/rest/svc/deviceid", s.getDeviceID) // id

2
lib/events/events.go
View File

@ -166,8 +166,8 @@ func NewLogger() *Logger {
func (l *Logger) Log(t EventType, data interface{}) { func (l *Logger) Log(t EventType, data interface{}) {
l.mutex.Lock() l.mutex.Lock()
dl.Debugln("log", l.nextGlobalID, t, data)
l.nextGlobalID++ l.nextGlobalID++
dl.Debugln("log", l.nextGlobalID, t, data)
e := Event{ e := Event{
GlobalID: l.nextGlobalID, GlobalID: l.nextGlobalID,