Compare commits

..

No commits in common. "master" and "v0.2.37" have entirely different histories.

2 changed files with 9 additions and 14 deletions

16
add.go
View File

@ -62,15 +62,13 @@ func (c *OldCluster) FindDropletByName(name string) *Droplet {
} }
func (c *OldCluster) FindDropletByUuid(id string) *Droplet { func (c *OldCluster) FindDropletByUuid(id string) *Droplet {
/* log.Info("START FIND", id)
log.Info("START FIND", id) loop := c.d.All() // get the list of droplets
loop := c.d.All() // get the list of droplets for loop.Scan() {
for loop.Scan() { d := loop.Next()
d := loop.Next() log.Info("droplet:", d.Hostname, d.Uuid)
log.Info("droplet:", d.Hostname, d.Uuid) }
} log.Info("END FIND", id)
log.Info("END FIND", id)
*/
return c.d.FindByUuid(id) return c.d.FindByUuid(id)
} }

View File

@ -99,7 +99,7 @@ func (c *OldCluster) ConfigLoad() error {
return err return err
} }
} else { } else {
log.Warn("ERROR HERE IN Hypervisors") fmt.Println("ERROR HERE IN Hypervisors")
return err return err
} }
@ -108,11 +108,8 @@ func (c *OldCluster) ConfigLoad() error {
// does it not stay allocated after this function ends? // does it not stay allocated after this function ends?
c.e = new(Events) c.e = new(Events)
} }
if err := c.e.loadEvents(); err != nil { if err := c.e.loadEvents(); err != nil {
// ignore events.pb since these should be sent elsewhere return err
log.Warn("Events failed to load, ignoring:", err)
return nil
} }
return nil return nil
} }