From fbf679b13ae66386d3fea9acb8b75d61abbf5933 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Fri, 4 Aug 2017 12:02:50 +0900 Subject: [PATCH] fix --- data_sender/data_sender.go | 22 +++++------- data_sender/data_sender_test.go | 62 ++++++++++++++++----------------- event_sender/event_sender.go | 15 +++----- file_cipher/file_cipher.go | 2 +- queue/queue.go | 5 ++- 5 files changed, 48 insertions(+), 58 deletions(-) diff --git a/data_sender/data_sender.go b/data_sender/data_sender.go index 3530d70..e8252a8 100644 --- a/data_sender/data_sender.go +++ b/data_sender/data_sender.go @@ -7,7 +7,7 @@ import ( pb "git.loafle.net/overflow/overflow_probe/crawler/grpc" q "git.loafle.net/overflow/overflow_probe/queue" "io/ioutil" - "log" + log "github.com/cihub/seelog" "os" "sync" ) @@ -64,7 +64,6 @@ func (ds *DataSender) handleData(qc chan interface{}) { collectedData := item.Value.(*pb.Output) d := &messages.Data{} d.Data = collectedData.Data - d.AgentId = agentIdentifier() result = append(result, d) } ds.send(result) @@ -108,7 +107,7 @@ func (ds *DataSender) addFailedData(data []*messages.Data) { failed := messages.Data{} err := json.Unmarshal(bytes, &failed) if err != nil { - log.Println(err) + log.Error(err) } data = append([]*messages.Data{&failed}, data...) //prepend } @@ -117,7 +116,7 @@ func (ds *DataSender) addFailedData(data []*messages.Data) { func (ds *DataSender) getFailedData() []byte { b, err := ioutil.ReadFile(FILE_PATH) if err != nil { - log.Println(err) + log.Error(err) return nil } return b @@ -126,7 +125,7 @@ func (ds *DataSender) getFailedData() []byte { func (ds *DataSender) removeFailed() { err := os.Remove(FILE_PATH) if err != nil { - log.Println(err) + log.Error(err) } } @@ -134,11 +133,11 @@ func (ds *DataSender) saveFailedData(datas []*messages.Data) { file, err := tempFile() if err != nil { - log.Println(err) + log.Error(err) } defer func() { if err := file.Close(); err != nil { - log.Println(err) + log.Error(err) return } }() @@ -146,13 +145,13 @@ func (ds *DataSender) saveFailedData(datas []*messages.Data) { for _, data := range datas { bytes, err := json.Marshal(&data) if err != nil { - log.Println(err) + log.Error(err) } if bytes != nil { - log.Println("write : ", string(bytes)) + log.Debug("write : ", string(bytes)) _, err = file.Write(bytes) if err != nil { - log.Println(err) + log.Error(err) } } } @@ -182,6 +181,3 @@ func tempFile() (*os.File, error) { return file, nil } -func agentIdentifier() string { - return "agentID_000000001" -} diff --git a/data_sender/data_sender_test.go b/data_sender/data_sender_test.go index 7318d24..b889a05 100644 --- a/data_sender/data_sender_test.go +++ b/data_sender/data_sender_test.go @@ -31,34 +31,34 @@ func TestTotal(t *testing.T) { time.Sleep(time.Second * 100) } -func TestSend(t *testing.T) { - - ds := &DataSender{} - ds.start() - - for i := 0; i < 20; i++ { - testNotify(strconv.Itoa(i)) - } - - time.Sleep(time.Second * 12) - for i := 20; i < 30; i++ { - testNotify(strconv.Itoa(i)) - } - - time.Sleep(time.Second * 100) -} - -func testNotify(val string) { - - result := make(map[string]string) - result["a"] = val - result["b"] = val - result["c"] = val - - cd := &Data{ - SensorId: "insanity", - Data: result, - } - - observer.Notify(messages.QUEUE_DATA, cd) -} +//func TestSend(t *testing.T) { +// +// ds := &DataSender{} +// ds.start() +// +// for i := 0; i < 20; i++ { +// testNotify(strconv.Itoa(i)) +// } +// +// time.Sleep(time.Second * 12) +// for i := 20; i < 30; i++ { +// testNotify(strconv.Itoa(i)) +// } +// +// time.Sleep(time.Second * 100) +//} +// +//func testNotify(val string) { +// +// result := make(map[string]string) +// result["a"] = val +// result["b"] = val +// result["c"] = val +// +// cd := &Data{ +// SensorId: "insanity", +// Data: result, +// } +// +// observer.Notify(messages.QUEUE_DATA, cd) +//} diff --git a/event_sender/event_sender.go b/event_sender/event_sender.go index e97aee9..2858909 100644 --- a/event_sender/event_sender.go +++ b/event_sender/event_sender.go @@ -8,7 +8,7 @@ import ( "git.loafle.net/overflow/overflow_probe/agent_api/messages" q "git.loafle.net/overflow/overflow_probe/queue" - "log" + log "github.com/cihub/seelog" "reflect" "sync" ) @@ -20,7 +20,6 @@ var ( const ( CENTRAL_ADDR = "192.168.1.105:50052" - SENDER_ID = "OVERFLOW_EVENT_SENDER" DEFAULT_INTERVAL = 1 ) @@ -113,7 +112,7 @@ func (es *EventSender) checkQueue() { for sc := range es.sc { items := reflect.ValueOf(sc) if items.Kind() != reflect.Slice { - log.Println("ddddd") + log.Info("ddddd") } for i := 0; i < items.Len(); i++ { @@ -131,11 +130,10 @@ func (es *EventSender) checkQueue() { } func (es *EventSender) send(data []*messages.Event) { - log.Println("Send Started") conn, err := grpc.Dial(CENTRAL_ADDR, grpc.WithInsecure()) if err != nil { - log.Fatal("Connection Error :", err.Error()) + log.Error("Connection Error :", err.Error()) return } defer conn.Close() @@ -144,12 +142,9 @@ func (es *EventSender) send(data []*messages.Event) { out, err := client.Status(context.Background(), &pb.Empty{}) if err != nil { - log.Fatal("client Error:", err.Error()) + log.Error("client Error:", err.Error()) return } - log.Print(out) + log.Debug(out) } -func agentIdentifier() string { - return "agentID_000000001" -} diff --git a/file_cipher/file_cipher.go b/file_cipher/file_cipher.go index 86d37ca..c68f144 100644 --- a/file_cipher/file_cipher.go +++ b/file_cipher/file_cipher.go @@ -7,7 +7,7 @@ import ( "os" ) -var KEY = []byte("qwerqwerqwerqwer") +var KEY = []byte("GIDISLLWGHX.EIIEUYWLIGLWI") func Encrypt(filePath, destName string) string { diff --git a/queue/queue.go b/queue/queue.go index 0fae54e..1d0662f 100644 --- a/queue/queue.go +++ b/queue/queue.go @@ -2,7 +2,7 @@ package queue import ( "container/heap" - "log" + log "github.com/cihub/seelog" "sync" "time" ) @@ -53,7 +53,6 @@ func (lq *LoafleQueue) getItems() { lq.senderChanel <- resultItems lq.size = lq.Len() - //log.Println("result length: ", len(resultItems)) resultItems = nil } } @@ -100,7 +99,7 @@ func (lq *LoafleQueue) Close() { func NewQueue(interval time.Duration, senderChanel chan interface{}) *LoafleQueue { items := make([]*Item, 0) - log.Println("NewQueu Start") + log.Info("New queue has started.") lq := &LoafleQueue{ items: items, interval: interval,