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 | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/server.go b/server.go index 017a8aa..acb238b 100644 --- a/server.go +++ b/server.go @@ -1,7 +1,6 @@ package main import ( - "errors" "flag" "fmt" "net" @@ -20,6 +19,7 @@ var sec = flag.Int("sec", 10, "the second for query data. ") var Level = flag.String("level","ErrorLevel","log level") +var IsHub = flag.String("hub", "hub", "hub is personIsHub=1") func main() { flag.Parse() @@ -42,9 +42,10 @@ for { conn, err := listener.Accept()// + connArr = append(connArr,conn) if err != nil { - log.Log.Errorf("some connecion error: %s\n", err) + log.Log.Infoln("some connecion error: ", err) } go handleConnection(conn,connArr) } @@ -57,51 +58,44 @@ ech := make(chan error) go func(conn net.Conn, ech chan error) { buf := make([]byte, 10) - for { - _, err := conn.Read(buf) - log.Log.Errorln("Read completed!") - if err != nil { - ech <- err - log.Log.Errorln("Read Error!conn.Close") - 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 { select { case <-tick.C: - handleMessage(conn, connArr) + if !handleMessage(conn, connArr){ + conn.Close() + return + } case err := <-ech: - log.Log.Errorln(err, "remoteAddr ", remoteAddr, " close") + log.Log.Infoln(err, "remoteAddr ", remoteAddr, " close") conn.Close() - break + return } } log.Log.Infoln("Client at " + remoteAddr + " disconnected.") } -func handleMessage(conn net.Conn, connArr []net.Conn) { - jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl) +func handleMessage(conn net.Conn, connArr []net.Conn) bool { + jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl, *IsHub) if jsonstring == nil { - log.Log.Infoln("the data is nil") - return + log.Log.Infoln("the data is nil,remoteArr:",conn.RemoteAddr()) + conn.Write([]byte("\000")) + return true } jsonstring = append(jsonstring, []byte("\000")...) log.Log.Infoln("jsonstring len: ", len(jsonstring), "\000 data: ", len("\000")) _, err := conn.Write(jsonstring) if err !=nil{ - log.Log.Errorln(err) - - //index :=0 - //for ;index < len(connArr); { - // if connArr[index] == conn{ - // connArr = append(connArr[:index],connArr[index+1:]...) - // continue - // } - // index++ - //} + log.Log.Infoln("conn.WriteErr:",err) + return false } + return true } -- Gitblit v1.8.0