From d671ea8ec8658da21990d5418c981d74f6015045 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 11 十二月 2019 11:50:43 +0800
Subject: [PATCH] add conf path

---
 server.go |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/server.go b/server.go
index 7abaf58..0a1a4c8 100644
--- a/server.go
+++ b/server.go
@@ -26,12 +26,15 @@
 var env = flag.String("env", "config", "env set")
 var mqIp = flag.String("mqIp", "172.17.50.245", "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)
+	config.Init(*env, *confPath)
 	fmt.Println(*port)
 	//src := *addr + ":" + strconv.Itoa(*port)
 	//listener, err := net.Listen("tcp", src)
@@ -56,8 +59,8 @@
 	//	go handleConnection(conn,connArr)
 	//}
 
+	mqAddr := "amqp://" + *mqUser + ":" + *mqPass + "@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
 
-	mqAddr := "amqp://guest:guest@" + *mqIp + ":" + strconv.Itoa(*mqPort)+"/"
 	conn, err := amqp.Dial(mqAddr)
 	if err != nil {
 		log.Log.Infof("Failed to connect to RabbitMQ,err:",err)
@@ -106,9 +109,9 @@
 						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

--
Gitblit v1.8.0