more shit

main.go

@@ -166,13 +166,14 @@ func main() {
 	}
 	go rpcHandler.Serve()
 
-	saveTimer := time.NewTicker(time.Second * 5)
 	go func() {
-		<-saveTimer.C
+		for range time.Tick(time.Minute) {
+			log.Printf("Saving...")
 			err := app.Save()
 			if err != nil {
 				log.Printf("Error saving: %v\n", err)
 			}
+		}
 	}()
 
 	syncedServer := NewPoolServer(syncedPool)

synced-pool.go

@@ -53,9 +53,9 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced
 		remoteIndex: make(map[CartId]*RemoteGrainPool),
 	}
 
-	go func(pingTimer *time.Ticker) {
+	go func() {
 		for {
-			<-pingTimer.C
+			for range time.Tick(time.Second * 2) {
 				for _, r := range pool.remotes {
 					err := DoPing(r)
 					if err != nil {
@@ -73,11 +73,12 @@ 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) {
+		go func() {
-			<-discoveryTimer.C
+			for range time.Tick(time.Second * 5) {
 				log.Printf("Looking for new nodes")
 				hosts, err := d.Discover()
 				if err != nil {
@@ -94,8 +95,8 @@ func NewSyncedPool(local *GrainLocalPool, hostname string, d Discovery) (*Synced
 						log.Printf("Error adding remote %s: %v", h, err)
 					}
 				}
-
+			}
-		}(time.NewTicker(time.Second * 5))
+		}()
 	} else {
 		log.Printf("No discovery, waiting for remotes to connect")
 	}