diff --git a/synced-pool.go b/synced-pool.go index 282393d..564f061 100644 --- a/synced-pool.go +++ b/synced-pool.go @@ -74,23 +74,24 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced connectedRemotes.Set(float64(len(pool.remotes))) } }(time.NewTicker(time.Second)) + if d != nil { go func(discoveryTimer *time.Ticker) { <-discoveryTimer.C - log.Printf("Looking for new nodes\n") + log.Printf("Looking for new nodes") hosts, err := d.Discover() if err != nil { - log.Printf("Error discovering hosts: %v\n", err) + log.Printf("Error discovering hosts: %v", err) } for _, h := range hosts { if h == hostname { continue } - log.Printf("Discovered host %s\n", h) + log.Printf("Discovered host %s", h) err := pool.AddRemote(h) if err != nil { - log.Printf("Error adding remote %s: %v\n", h, err) + log.Printf("Error adding remote %s: %v", h, err) } } otherHosts, err := pool.Negotiate(hosts) @@ -116,7 +117,7 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced } } - }(time.NewTicker(time.Second * 5)) + }(time.NewTicker(time.Second * 10)) } go func() { for { @@ -204,6 +205,10 @@ func NewPacketQueue(connection net.Conn) *PacketQueue { messageType, data, err := ReceivePacket(queue.connection) if err != nil { log.Printf("Error receiving packet: %v\n", err) + if err == io.EOF { + return + } + //return } queue.mu.Lock()