This commit is contained in:
insanity@loafle.com 2017-08-04 11:37:00 +09:00
parent c8384ea1f9
commit 4e80885df2
2 changed files with 21 additions and 21 deletions

View File

@ -1,7 +1,7 @@
package initializer
import (
cm "git.loafle.net/overflow/overflow_probe//agent_api/config_manager"
cm "git.loafle.net/overflow/overflow_probe/agent_api/config_manager"
"google.golang.org/grpc"
"sync"
)
@ -46,11 +46,11 @@ func (i *Initializer) getSecretKey() (string, error) {
addr := i.gconf.Central.Address + ":" + string(i.gconf.Central.Port)
conn, err := grpc.Dial(addr, grpc.WithInsecure())
if err != nil {
return nil, err
return "", err
}
defer conn.Close()
return nil, nil
return "", nil
}

View File

@ -132,9 +132,9 @@ func (agt *Agent) waitAgentTask() {
d := <-agt.taskCh
task := d.(msg.AgentTask)
switch task.Command {
case msg.TASK_POL_INTERVAL_UPDATE:
agt.processUpdatePolInterval(task)
break
//case msg.TASK_POL_INTERVAL_UPDATE:
// agt.processUpdatePolInterval(task)
// break
case msg.TASK_SENSOR_START:
agt.processStartSensor(task)
break
@ -193,12 +193,12 @@ func (agt *Agent) stopAgent() {
dat.Stop(datStopped)
<-datStopped
//pol stop()
polStopped := make(chan bool, 1)
if err := pol.Stop(polStopped); err != nil {
return
}
<-polStopped
////pol stop()
//polStopped := make(chan bool, 1)
//if err := pol.Stop(polStopped); err != nil {
// return
//}
//<-polStopped
evt.AddEventData(msg.Event{msg.EVT_TYPE_NONE, msg.EVENT_AGT_STOP, nil})
evt.Stop()
@ -281,12 +281,12 @@ func (agt *Agent) processSendLog(task msg.AgentTask) {
evt.AddEventData(msg.Event{msg.EVT_TYPE_TASK, task.Params["id"], nil})
}
func (agt *Agent) processUpdatePolInterval(task msg.AgentTask) {
interval := task.Params["interval"]
err := pol.UpdateInterval(interval)
if err != nil {
log.Error(err)
return
}
evt.AddEventData(msg.Event{msg.EVT_TYPE_TASK, task.Params["id"], nil})
}
//func (agt *Agent) processUpdatePolInterval(task msg.AgentTask) {
// interval := task.Params["interval"]
// err := pol.UpdateInterval(interval)
// if err != nil {
// log.Error(err)
// return
// }
// evt.AddEventData(msg.Event{msg.EVT_TYPE_TASK, task.Params["id"], nil})
//}