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

Merge remote-tracking branch 'origin/pr/793'

Browse Source 
* origin/pr/793:
  Minor fixes.
This commit is contained in:
Jakob Borg
2014-10-07 07:43:23 +02:00
parent cbbd20a687 1a2a27b988
commit 640d5135df
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/discover/discover.go
View File

@@ -132,9 +132,9 @@ func (d *Discoverer) ExtAnnounceOK() bool {
} }
func (d *Discoverer) Lookup(device protocol.DeviceID) []string { func (d *Discoverer) Lookup(device protocol.DeviceID) []string {
d.registryLock.Lock() d.registryLock.RLock()
cached := d.filterCached(d.registry[device]) cached := d.filterCached(d.registry[device])
d.registryLock.Unlock() d.registryLock.RUnlock()
if len(cached) > 0 { if len(cached) > 0 {
addrs := make([]string, len(cached)) addrs := make([]string, len(cached))

8
internal/events/events.go
View File

@@ -25,7 +25,7 @@ import (
type EventType uint64 type EventType uint64
const ( const (
Ping = 1 << iota Ping EventType = 1 << iota
Starting Starting
StartupComplete StartupComplete
DeviceDiscovered DeviceDiscovered
@@ -39,7 +39,7 @@ const (
FolderRejected FolderRejected
ConfigSaved ConfigSaved
AllEvents = ^EventType(0) AllEvents = (1 << iota) - 1
) )
func (t EventType) String() string { func (t EventType) String() string {
@@ -131,7 +131,7 @@ func (l *Logger) Log(t EventType, data interface{}) {
select { select {
case s.events <- e: case s.events <- e:
default: default:
//log.Println("Dropping event:", e) // if s.events is not ready, drop the event
} }
} }
} }
@@ -157,7 +157,7 @@ func (l *Logger) Subscribe(mask EventType) *Subscription {
func (l *Logger) Unsubscribe(s *Subscription) { func (l *Logger) Unsubscribe(s *Subscription) {
l.mutex.Lock() l.mutex.Lock()
if debug { if debug {
dl.Debugln("unsubsribe") dl.Debugln("unsubscribe")
} }
delete(l.subs, s.id) delete(l.subs, s.id)
close(s.events) close(s.events)

3
internal/files/set_test.go
View File

@@ -858,7 +858,8 @@ func TestLongPath(t *testing.T) {
t.Fatalf("Incorrect len %d != 1 for global list", l) t.Fatalf("Incorrect len %d != 1 for global list", l)
} }
if gf[0].Name != local[0].Name { if gf[0].Name != local[0].Name {
t.Error("Incorrect long filename;\n%q !=\n%q", gf[0].Name, local[0].Name) t.Errorf("Incorrect long filename;\n%q !=\n%q",
gf[0].Name, local[0].Name)
} }
} }