From a7602018176ee34e055a2877c1b54bd0c950440d Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 01 十一月 2019 16:24:05 +0800
Subject: [PATCH] fix
---
server.go | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/server.go b/server.go
index 017a8aa..eb83692 100644
--- a/server.go
+++ b/server.go
@@ -1,31 +1,34 @@
package main
import (
- "errors"
"flag"
"fmt"
"net"
"strconv"
"time"
- "github.com/long/test/esutil"
- log "github.com/long/test/log"
+ "andriodServer/esutil"
+ "andriodServer/extend/config"
+ log "andriodServer/log"
)
-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 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 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")
+var IsHub = flag.String("hub", "hub", "hub is personIsHub=1")
+var Size = flag.Int("size", 100, "size default is 100")
+var env = flag.String("env", "config", "env set")
func main() {
flag.Parse()
log.SetLogLevel(*Level)
-
+ config.Init(*env)
fmt.Println(*port)
src := *addr + ":" + strconv.Itoa(*port)
listener, err := net.Listen("tcp", src)
@@ -42,9 +45,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 +61,48 @@
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, *Size)
if jsonstring == nil {
- log.Log.Infoln("the data is nil")
- return
+ log.Log.Infoln("the data is nil,remoteArr:",conn.RemoteAddr())
+ if _, err := conn.Write([]byte("\000"));err !=nil {
+ log.Log.Infoln("conn.WriteErr:",err)
+ return false
+ } else {
+ 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