diff options
Diffstat (limited to 'machine.go')
| -rw-r--r-- | machine.go | 38 |
1 files changed, 20 insertions, 18 deletions
@@ -6,9 +6,9 @@ package main import ( "fmt" "net/http" - "strings" "time" + "go.wit.com/lib/protobuf/httppb" "go.wit.com/lib/protobuf/zoopb" "go.wit.com/log" "google.golang.org/protobuf/types/known/timestamppb" @@ -20,25 +20,27 @@ func rawGetHostname(data []byte) *zoopb.Machine { return newm } -func handleMachine(r *http.Request, w http.ResponseWriter, hostname string, data []byte) { - hostname = strings.TrimSpace(hostname) - newm := rawGetHostname(data) +func handleMachine(w http.ResponseWriter, reqPB *httppb.HttpRequest) { + // hostname := strings.TrimSpace(reqPB.Hostname) + newm := rawGetHostname(reqPB.ClientData) if newm == nil { - log.Info("unmarshal failed on data len =", len(data)) - } - if hostname != newm.Hostname { - // log.Info("hostname mismatch", hostname, "vs", newm.Hostname) - hostname = newm.Hostname + log.Info("unmarshal failed on data len =", len(reqPB.ClientData)) } + /* + if reqPB.Hostname != newm.Hostname { + // log.Info("hostname mismatch", hostname, "vs", newm.Hostname) + hostname = newm.Hostname + } + */ - if hostname == "" { - ua := dumpUserAgent(r) - ra := dumpRemoteAddr(r) - log.Info("hostname is blank even after unmarshal. data len =", len(data), ra, ua, newm.Cpus, newm.Hostname) + if reqPB.Hostname == "" { + ua := reqPB.DumpUserAgent() + ra := reqPB.DumpRemoteAddr() + log.Info("hostname is blank even after unmarshal. data len =", len(reqPB.ClientData), ra, ua, newm.Cpus, newm.Hostname) return } // log.Info("lookoing for", hostname) - m := me.machines.FindByHostname(hostname) + m := me.machines.FindByHostname(reqPB.Hostname) if m == nil { am := new(zoopb.Machine) am.Hostname = newm.Hostname @@ -47,10 +49,10 @@ func handleMachine(r *http.Request, w http.ResponseWriter, hostname string, data log.Info("new machine", am.Hostname, am.Memory) return } - ua := dumpUserAgent(r) - ra := dumpRemoteAddr(r) + ua := reqPB.DumpUserAgent() + ra := reqPB.DumpRemoteAddr() if m.UserAgent != ua { - log.Info("hostname ua changed len =", len(data), ra, hostname, ua) + log.Info("hostname ua changed len =", len(reqPB.ClientData), ra, reqPB.Hostname, ua) m.UserAgent = ua } if m.Upgrade { @@ -65,7 +67,7 @@ func handleMachine(r *http.Request, w http.ResponseWriter, hostname string, data } else { fmt.Fprintln(w, "good") } - // log.Info("update machine protobuf", hostname) + // log.Info("update machine protobuf", reqPB.hostname) updateMachine(newm) } |