|
@@ -40,14 +40,26 @@ func DestroyMysql() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func ReadConfig() bool {
|
|
func ReadConfig() bool {
|
|
|
- dir, _ := os.Getwd() //filepath.Abs(filepath.Dir(os.Args[0]))
|
|
|
|
|
|
|
+ dir, _ := os.Getwd()
|
|
|
fPath := dir + string(filepath.Separator) + "conf" + string(filepath.Separator)
|
|
fPath := dir + string(filepath.Separator) + "conf" + string(filepath.Separator)
|
|
|
errA := RedisConfig.ReadConfig(fPath, "redis")
|
|
errA := RedisConfig.ReadConfig(fPath, "redis")
|
|
|
errB := MySQLConfig.ReadConfig(fPath, "mysql")
|
|
errB := MySQLConfig.ReadConfig(fPath, "mysql")
|
|
|
errC := MQTTConfig.ReadConfig(fPath, "broker")
|
|
errC := MQTTConfig.ReadConfig(fPath, "broker")
|
|
|
errD := mainConfig.ReadConfig(fPath, "ipolesvr")
|
|
errD := mainConfig.ReadConfig(fPath, "ipolesvr")
|
|
|
_ = MqttconfigHl.ReadConfig(fPath, "broker_highland")
|
|
_ = MqttconfigHl.ReadConfig(fPath, "broker_highland")
|
|
|
- return errA && errB && errC && errD //&& err_e
|
|
|
|
|
|
|
+ if !errA {
|
|
|
|
|
+ logrus.Error("读取redis配置失败")
|
|
|
|
|
+ }
|
|
|
|
|
+ if !errB {
|
|
|
|
|
+ logrus.Error("读取mysql配置失败")
|
|
|
|
|
+ }
|
|
|
|
|
+ if !errC {
|
|
|
|
|
+ logrus.Error("读取mqtt broker配置失败")
|
|
|
|
|
+ }
|
|
|
|
|
+ if !errD {
|
|
|
|
|
+ logrus.Error("读取ipolesvr配置失败")
|
|
|
|
|
+ }
|
|
|
|
|
+ return errA && errB && errC && errD
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func main() {
|
|
func main() {
|
|
@@ -67,7 +79,7 @@ func main() {
|
|
|
}()
|
|
}()
|
|
|
|
|
|
|
|
if !ReadConfig() {
|
|
if !ReadConfig() {
|
|
|
- panic(nil)
|
|
|
|
|
|
|
+ logrus.Fatal("读取配置文件失败,服务退出")
|
|
|
}
|
|
}
|
|
|
GetMQTTMgr()
|
|
GetMQTTMgr()
|
|
|
GetHlMqttMgr() //hl
|
|
GetHlMqttMgr() //hl
|