From 6d09d7170c99f8d16acdbcb0a2280ccab950c84c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期六, 01 八月 2020 10:33:00 +0800
Subject: [PATCH] add systemd service
---
server.go | 96 +++++------------------------------------------
1 files changed, 11 insertions(+), 85 deletions(-)
diff --git a/server.go b/server.go
index 25569d2..eac0482 100644
--- a/server.go
+++ b/server.go
@@ -1,21 +1,21 @@
package main
import (
+ "andriodServer/controllers"
+ "andriodServer/router"
"flag"
"fmt"
- "net"
"strconv"
"time"
"andriodServer/esutil"
- "andriodServer/extend/config"
"andriodServer/log"
"github.com/streadway/amqp"
)
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.57: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")
@@ -24,7 +24,7 @@
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")
-var mqIp = flag.String("mqIp", "172.17.50.245", "default mq ip")
+var mqIp = flag.String("mqIp", "172.16.50.57", "default mq ip")
var mqPort = flag.Int("mqPort", 5672, "default mq port")
var mqUser = flag.String("mqUser", "basic", "default rabbitmq user")
var mqPass = flag.String("mqPass", "basic", "default rabbitmq pass")
@@ -33,30 +33,9 @@
flag.Parse()
log.SetLogLevel(*Level)
- config.Init(*env)
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)
- //}
+ controllers.EsUrl = *Eurl
mqAddr := "amqp://" + *mqUser + ":" + *mqPass + "@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
@@ -86,6 +65,8 @@
log.Log.Infof("Failed to declare a queue,err:",err)
return
}
+ r := router.NewRouter()
+ go r.Run("0.0.0.0:"+strconv.Itoa(*port))
handleAlarmData2MQ(q, ch)
}
@@ -96,7 +77,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(
"",
@@ -108,67 +89,12 @@
Body: alarmData,
})
if err !=nil {
- log.Log.Infof("send to mq err:",err)
+ log.Log.Infof("send to mq err:"+err.Error())
} else {
- log.Log.Infof("send to mq success,len(body):",len(alarmData))
+ log.Log.Infof("send to mq success,msg: "+string(alarmData))
}
}
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
}
--
Gitblit v1.8.0