From a5e6ddc46a0306f630ac53a8e0e3843bf8c17a05 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 07 四月 2021 16:43:09 +0800
Subject: [PATCH] 修复日志路径问题
---
server.go | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server.go b/server.go
index e4ec3ee..85f1df3 100644
--- a/server.go
+++ b/server.go
@@ -1,40 +1,41 @@
package main
import (
+ "andriodServer/controllers"
+ "andriodServer/router"
"flag"
"fmt"
"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://172.16.50.241:9200/", "The port to listen on")
+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")
+var sec = flag.Int("sec", 20, "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")
-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")
-var confPath = flag.String("confPath", "/home/basic/Apps/go/AndroidAlarmServer/config/","default config path")
func main() {
flag.Parse()
log.SetLogLevel(*Level)
- config.Init(*env, *confPath)
fmt.Println(*port)
+
+ controllers.EsUrl = *Eurl
mqAddr := "amqp://" + *mqUser + ":" + *mqPass + "@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
@@ -64,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)
}
@@ -94,4 +97,4 @@
lastTime = curTime
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0