From 22955cd5a948ace0f497c9d618914607f86dba5c Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 06 六月 2019 15:41:19 +0800
Subject: [PATCH] add hub flag
---
server.go | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/server.go b/server.go
index 5064c21..acb238b 100644
--- a/server.go
+++ b/server.go
@@ -5,7 +5,6 @@
"fmt"
"net"
"strconv"
- "strings"
"time"
"github.com/long/test/esutil"
@@ -20,7 +19,8 @@
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 IsHub = flag.String("hub", "hub", "hub is personIsHub=1")
+
func main() {
flag.Parse()
@@ -40,17 +40,9 @@
connArr:=make([]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
connArr = append(connArr,conn)
if err != nil {
log.Log.Infoln("some connecion error: ", err)
@@ -66,13 +58,12 @@
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)
+
tick := time.NewTicker(10 * time.Second)
for {
@@ -87,16 +78,16 @@
conn.Close()
return
}
-
}
log.Log.Infoln("Client at " + remoteAddr + " disconnected.")
}
func handleMessage(conn net.Conn, connArr []net.Conn) bool {
- jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
+ jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl, *IsHub)
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