From 1c62ece5b48728079823c3963c51317a9c2f5635 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 01 六月 2019 11:41:04 +0800
Subject: [PATCH] Errorln to Infoln
---
server.go | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/server.go b/server.go
index e9bc16b..ce7a671 100644
--- a/server.go
+++ b/server.go
@@ -18,8 +18,12 @@
var port = flag.Int("port", 6000, "The port to listen on; ")
var sec = flag.Int("sec", 10, "the second for query data. ")
+var Level = flag.String("level","ErrorLevel","log level")
+
func main() {
flag.Parse()
+
+ log.SetLogLevel(*Level)
fmt.Println(*port)
src := *addr + ":" + strconv.Itoa(*port)
@@ -33,25 +37,33 @@
fmt.Println("starting server success.")
defer listener.Close()
+ connArr:=make([]net.Conn,0)
+
for {
- conn, err := listener.Accept()
+ 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)
+ go handleConnection(conn,connArr)
}
}
-func handleConnection(conn net.Conn) {
+func handleConnection(conn net.Conn, connArr []net.Conn) {
remoteAddr := conn.RemoteAddr().String()
log.Log.Infoln("Client connected from ", remoteAddr)
ech := make(chan error)
go func(conn net.Conn, ech chan error) {
buf := make([]byte, 10)
- _, err := conn.Read(buf)
- if err != nil {
- ech <- err
+ for {
+ _, err := conn.Read(buf)
+ log.Log.Infoln("Read completed!")
+ if err != nil {
+ ech <- err
+ log.Log.Infoln("Read Error!conn.Close")
+ break
+ }
}
}(conn, ech)
tick := time.NewTicker(10 * time.Second)
@@ -59,9 +71,10 @@
for {
select {
case <-tick.C:
- handleMessage(conn)
+ handleMessage(conn, connArr)
case err := <-ech:
- log.Log.Errorln(err, "remoteAddr ", remoteAddr, " close")
+ log.Log.Infoln(err, "remoteAddr ", remoteAddr, " close")
+ conn.Close()
break
}
}
@@ -69,7 +82,7 @@
log.Log.Infoln("Client at " + remoteAddr + " disconnected.")
}
-func handleMessage(conn net.Conn) {
+func handleMessage(conn net.Conn, connArr []net.Conn) {
jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
if jsonstring == nil {
log.Log.Infoln("the data is nil")
@@ -77,5 +90,17 @@
}
jsonstring = append(jsonstring, []byte("\000")...)
log.Log.Infoln("jsonstring len: ", len(jsonstring), "\000 data: ", len("\000"))
- conn.Write(jsonstring)
+ _, err := conn.Write(jsonstring)
+ if err !=nil{
+ log.Log.Infoln("conn.WriteErr:",err)
+
+ //index :=0
+ //for ;index < len(connArr); {
+ // if connArr[index] == conn{
+ // connArr = append(connArr[:index],connArr[index+1:]...)
+ // continue
+ // }
+ // index++
+ //}
+ }
}
--
Gitblit v1.8.0