allow eof
Some checks are pending
Build and Publish / BuildAndDeploy (push) Waiting to run

This commit is contained in:
matst80
2024-11-09 22:45:03 +01:00
parent c9280090bf
commit 5411921afb

View File

@@ -74,23 +74,24 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced
connectedRemotes.Set(float64(len(pool.remotes))) connectedRemotes.Set(float64(len(pool.remotes)))
} }
}(time.NewTicker(time.Second)) }(time.NewTicker(time.Second))
if d != nil { if d != nil {
go func(discoveryTimer *time.Ticker) { go func(discoveryTimer *time.Ticker) {
<-discoveryTimer.C <-discoveryTimer.C
log.Printf("Looking for new nodes\n") log.Printf("Looking for new nodes")
hosts, err := d.Discover() hosts, err := d.Discover()
if err != nil { if err != nil {
log.Printf("Error discovering hosts: %v\n", err) log.Printf("Error discovering hosts: %v", err)
} }
for _, h := range hosts { for _, h := range hosts {
if h == hostname { if h == hostname {
continue continue
} }
log.Printf("Discovered host %s\n", h) log.Printf("Discovered host %s", h)
err := pool.AddRemote(h) err := pool.AddRemote(h)
if err != nil { 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) 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() { go func() {
for { for {
@@ -204,6 +205,10 @@ func NewPacketQueue(connection net.Conn) *PacketQueue {
messageType, data, err := ReceivePacket(queue.connection) messageType, data, err := ReceivePacket(queue.connection)
if err != nil { if err != nil {
log.Printf("Error receiving packet: %v\n", err) log.Printf("Error receiving packet: %v\n", err)
if err == io.EOF {
return
}
//return //return
} }
queue.mu.Lock() queue.mu.Lock()