From fcdc5890e9a8204805f6347364c3eaa94dff948d Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 16 六月 2020 18:50:40 +0800
Subject: [PATCH] done yuying
---
server.go | 86 ++-----------------------------------------
1 files changed, 4 insertions(+), 82 deletions(-)
diff --git a/server.go b/server.go
index 0a1a4c8..e4ec3ee 100644
--- a/server.go
+++ b/server.go
@@ -3,7 +3,6 @@
import (
"flag"
"fmt"
- "net"
"strconv"
"time"
@@ -14,8 +13,8 @@
)
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 Eurl = flag.String("eurl", "http://172.16.50.241: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")
@@ -36,28 +35,6 @@
log.SetLogLevel(*Level)
config.Init(*env, *confPath)
fmt.Println(*port)
- //src := *addr + ":" + strconv.Itoa(*port)
- //listener, err := net.Listen("tcp", src)
- //if err != nil {
- // log.Log.Errorln(err)
- // return
- //}
- //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()//
- //
- // connArr = append(connArr,conn)
- // if err != nil {
- // log.Log.Infoln("some connecion error: ", err)
- // }
- // go handleConnection(conn,connArr)
- //}
mqAddr := "amqp://" + *mqUser + ":" + *mqPass + "@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
@@ -97,7 +74,7 @@
select {
case <-tick.C:
curTime := time.Now()
- alarmData := esutil.PostAction(*sec, *Eurl, *Picurl, *IsHub, *Size, lastTime, curTime)
+ alarmData := esutil.PostAction(*sec, *Eurl, *IsHub, *Size, lastTime, curTime)
if alarmData != nil {
err := ch.Publish(
"",
@@ -117,59 +94,4 @@
lastTime = curTime
}
}
-}
-
-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)
- readMsg, err := conn.Read(buf)
- log.Log.Infoln("Read completed,readMsg:",readMsg,",err:",err)
- ech <- err
-
- }(conn, ech)
-
- tick := time.NewTicker(3 * time.Second)
- lastTime := time.Now()
- for {
- select {
- case <-tick.C:
- curTime := time.Now()
- if !handleMessage(conn, connArr, lastTime, curTime){
- conn.Close()
- return
- }
- lastTime = curTime
- case err := <-ech:
- log.Log.Infoln(err, "remoteAddr ", remoteAddr, " close")
- conn.Close()
- return
- }
- }
-
- log.Log.Infoln("Client at " + remoteAddr + " disconnected.")
-}
-
-func handleMessage(conn net.Conn, connArr []net.Conn,lastT time.Time, curTime time.Time) bool {
- jsonstring := esutil.PostAction(*sec, *Eurl, *Picurl, *IsHub, *Size, lastT, curTime)
- if jsonstring == nil {
- 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.Infoln("conn.WriteErr:",err)
- return false
- }
- return true
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0