Merge remote-tracking branch 'origin/master'

data_sender/data_sender.go

@@ -6,8 +6,8 @@ import (
 	"git.loafle.net/overflow/overflow_probe/agent_api/messages"
 	pb "git.loafle.net/overflow/overflow_probe/crawler/grpc"
 	q "git.loafle.net/overflow/overflow_probe/queue"
-	"io/ioutil"
 	log "github.com/cihub/seelog"
+	"io/ioutil"
 	"os"
 	"sync"
 )
@@ -180,4 +180,3 @@ func tempFile() (*os.File, error) {
 
 	return file, nil
 }
-

data_sender/data_sender_test.go

@@ -20,12 +20,12 @@ func TestTotal(t *testing.T) {
 	time.Sleep(time.Second * 5)
 
 	for i := 0; i < 20; i++ {
-		testNotify(strconv.Itoa(i))
+		//testNotify(strconv.Itoa(i))
 	}
 
 	time.Sleep(time.Second * 12)
 	for i := 20; i < 30; i++ {
-		testNotify(strconv.Itoa(i))
+		//testNotify(strconv.Itoa(i))
 	}
 
 	time.Sleep(time.Second * 100)

event_sender/event_sender.go

@@ -147,4 +147,3 @@ func (es *EventSender) send(data []*messages.Event) {
 	}
 	log.Debug(out)
 }
-