diff options
Diffstat (limited to 'http.go')
| -rw-r--r-- | http.go | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -36,16 +36,16 @@ func okHandler(w http.ResponseWriter, r *http.Request) { var m *zoopb.Machine m = new(zoopb.Machine) if err := m.Unmarshal(msg); err != nil { - log.Info("proto.Unmarshal() failed on wire message len", len(msg), "from", hostname) + log.Info("proto.Unmarshal() failed on wire message len", len(msg)) + log.Info("error =", err) return } - if m.Packages == nil { - log.Info("Unmarshal worked with msg len", len(msg), "from", m.Hostname) - log.Info(m.Hostname, "sent machine") - } else { - - log.Info("Unmarshal worked with msg len", len(msg), "from", m.Hostname) - log.Info(m.Hostname, "has", m.Packages.Len(), "packages installed") + log.Info("proto.Unmarshal() worked on wire message len", len(msg), "from", m.Hostname) + switch updateMachine(m) { + case "upgrade": + fmt.Fprintln(w, "upgrade") + default: + fmt.Fprintln(w, "notsure") } return } @@ -66,13 +66,6 @@ func okHandler(w http.ResponseWriter, r *http.Request) { log.Info("Unmarshal worked with msg len", len(msg), "from", hostname) log.Info(hostname, "has", packs.Len(), "packages installed") fmt.Fprintln(w, "upgrade") - - m := me.machines.FindByName(hostname) - if m == nil { - log.Info("did not find", hostname) - } else { - log.Info("found", hostname) - } return } |