refactor agent

Author: muraty

agent/http.go

@@ -98,12 +98,11 @@ func (a *Agent) createAgentProcess(proc *hostProc) *types.AgentProcess {
 		log.Debugf("Cmdline could not found for %d\n", proc.process.Pid)
 	}
 	return &types.AgentProcess{
-		Laddr:    types.IPPort{IP: proc.conn.Laddr.IP, Port: proc.conn.Laddr.Port},
-		Status:   proc.conn.Status,
-		Pid:      proc.conn.Pid,
-		Name:     name,
-		CmdLine:  cl,
-		Hostname: a.Hostname,
+		Laddr:   types.IPPort{IP: proc.conn.Laddr.IP, Port: proc.conn.Laddr.Port},
+		Status:  proc.conn.Status,
+		Pid:     proc.conn.Pid,
+		Name:    name,
+		CmdLine: cl,
 	}
 }
 
@@ -117,11 +116,14 @@ func (a *Agent) Process(w http.ResponseWriter, req *http.Request) {
 	}
 	p := a.findProc(port)
 	ap := a.createAgentProcess(p)
+
+	w.Header().Set("Content-Type", "application/json")
 	if ap == nil {
-		http.Error(w, "process not found!", http.StatusNotFound)
+		json.NewEncoder(w).Encode(&types.AgentProcess{
+			Hostname: a.Hostname,
+		})
 		return
 	}
-	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(&ap)
 	return
 }

server/agent.go

@@ -44,14 +44,14 @@ func (a *Agent) Fetch(ctx context.Context, host string, port uint32) (*types.Age
 		return nil, errors.New("status code is not 200")
 	}
 
-	dp := types.AgentProcess{}
-	err = json.NewDecoder(response.Body).Decode(&dp)
+	ap := types.AgentProcess{}
+	err = json.NewDecoder(response.Body).Decode(&ap)
 
 	// todo: consider NotFound
 	if err != nil {
 		log.Errorln(err.Error())
 		return nil, err
 	}
 
-	return &dp, nil
+	return &ap, nil
 }

server/client.go

@@ -40,12 +40,14 @@ func (kp *KimoProcess) SetAgentProcess(ctx context.Context, wg *sync.WaitGroup)
 		host = kp.MysqlProcess.Address.IP
 		port = kp.MysqlProcess.Address.Port
 	}
-	dp, err := kp.Agent.Fetch(ctx, host, port)
+	ap, err := kp.Agent.Fetch(ctx, host, port)
 	if err != nil {
 		log.Debugln(err.Error())
-		kp.AgentProcess = &types.AgentProcess{}
+		kp.AgentProcess = &types.AgentProcess{
+			Hostname: "ERROR",
+		}
 	} else {
-		kp.AgentProcess = dp
+		kp.AgentProcess = ap
 	}
 }