From 730c4de722b11932e81d92ff2e883b4b5f20c654 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 04 六月 2019 09:49:46 +0800
Subject: [PATCH] fix server,return when conn closed
---
server.go | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/server.go b/server.go
index 18d4f8e..a39a6c9 100644
--- a/server.go
+++ b/server.go
@@ -2,6 +2,7 @@
import (
"flag"
+ "fmt"
"net"
"strconv"
"time"
@@ -10,17 +11,21 @@
log "github.com/long/test/log"
)
-var addr = flag.String("addr", "192.168.1.124", "The address to listen to;")
+var addr = flag.String("addr", "0.0.0.0", "The address to listen to;")
var Eurl = flag.String("eurl", "http://192.168.1.182:9200/", "The port to listen on; ")
+var Picurl = flag.String("picurl", "http://58.118.225.79:41242/", "picture url ")
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.Log.Infoln("starting server...")
+ log.SetLogLevel(*Level)
+ fmt.Println(*port)
src := *addr + ":" + strconv.Itoa(*port)
listener, err := net.Listen("tcp", src)
if err != nil {
@@ -29,27 +34,33 @@
}
log.Log.Infof("Listening on %s.\n", src)
+ 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 {
+ for {
+ readMsg, err := conn.Read(buf)
+ log.Log.Infoln("Read completed,readMsg:",readMsg,",err:",err)
ech <- err
+ break
}
}(conn, ech)
tick := time.NewTicker(10 * time.Second)
@@ -57,23 +68,33 @@
for {
select {
case <-tick.C:
- handleMessage(conn)
+ if !handleMessage(conn, connArr){
+ conn.Close()
+ return
+ }
case err := <-ech:
- log.Log.Errorln(err, "remoteAddr ", remoteAddr, " close")
- break
+ log.Log.Infoln(err, "remoteAddr ", remoteAddr, " close")
+ conn.Close()
+ return
}
+
}
log.Log.Infoln("Client at " + remoteAddr + " disconnected.")
}
-func handleMessage(conn net.Conn) {
- jsonstring := esutil.PostAction(*sec, *Eurl)
+func handleMessage(conn net.Conn, connArr []net.Conn) bool {
+ jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl)
if jsonstring == nil {
- log.Log.Infoln("the data is nil")
- return
+ log.Log.Infoln("the data is nil,remoteArr:",conn.RemoteAddr())
+ return true
}
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)
+ return false
+ }
+ return true
}
--
Gitblit v1.8.0