From 8aff0555e768c90671c0dddaa5291699a4280c6d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 04 六月 2019 11:54:10 +0800
Subject: [PATCH] send \0 when es data is nil
---
server.go | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/server.go b/server.go
index 5064c21..f33830b 100644
--- a/server.go
+++ b/server.go
@@ -5,7 +5,6 @@
"fmt"
"net"
"strconv"
- "strings"
"time"
"github.com/long/test/esutil"
@@ -20,7 +19,7 @@
var sec = flag.Int("sec", 10, "the second for query data. ")
var Level = flag.String("level","ErrorLevel","log level")
-var ipMap map[string]net.Conn
+//var ipMap map[string]net.Conn
func main() {
flag.Parse()
@@ -40,17 +39,18 @@
connArr:=make([]net.Conn,0)
- ipMap = make(map[string]net.Conn,0)
+ //ipMap = make(map[string]net.Conn,0)
for {
conn, err := listener.Accept()//
- clientIpPort := conn.RemoteAddr().String()
- index := strings.Index(clientIpPort, ":")
- ipStr := clientIpPort[:index-1]
- if oldConn,ok := ipMap[ipStr];ok {
- oldConn.Close()
- }
- ipMap[ipStr] = conn
+ //clientIpPort := conn.RemoteAddr().String()
+ //index := strings.Index(clientIpPort, ":")
+ //ipStr := clientIpPort[:index-1]
+ //if oldConn,ok := ipMap[ipStr];ok {
+ // oldConn.Close()
+ //}
+ //ipMap[ipStr] = conn
+
connArr = append(connArr,conn)
if err != nil {
log.Log.Infoln("some connecion error: ", err)
@@ -66,13 +66,22 @@
ech := make(chan error)
go func(conn net.Conn, ech chan error) {
buf := make([]byte, 10)
- for {
- readMsg, err := conn.Read(buf)
- log.Log.Infoln("Read completed,readMsg:",readMsg,",err:",err)
- ech <- err
- break
- }
+ readMsg, err := conn.Read(buf)
+ log.Log.Infoln("Read completed,readMsg:",readMsg,",err:",err)
+ ech <- err
+
}(conn, ech)
+ go func(conArray []net.Conn) {
+ for {
+ if len(conArray)>50 {
+ for _,connEach :=range conArray{
+ connEach.Close()
+ }
+ return
+ }
+ time.Sleep(200*time.Second)
+ }
+ }(connArr)
tick := time.NewTicker(10 * time.Second)
for {
@@ -97,6 +106,7 @@
jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
if jsonstring == nil {
log.Log.Infoln("the data is nil,remoteArr:",conn.RemoteAddr())
+ conn.Write([]byte("\000"))
return true
}
jsonstring = append(jsonstring, []byte("\000")...)
--
Gitblit v1.8.0