|
@@ -16,7 +16,7 @@ const (
|
|
|
DefaultQoS byte = 1
|
|
DefaultQoS byte = 1
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
-var Reporter *MQTTReporter
|
|
|
|
|
|
|
+var reporter *MQTTReporter
|
|
|
|
|
|
|
|
type MQTTReporter struct {
|
|
type MQTTReporter struct {
|
|
|
config *ServerConfig
|
|
config *ServerConfig
|
|
@@ -30,7 +30,7 @@ type MQTTReporter struct {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func ModuleInit() bool {
|
|
func ModuleInit() bool {
|
|
|
- if Reporter != nil {
|
|
|
|
|
|
|
+ if reporter != nil {
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -50,7 +50,7 @@ func ModuleInit() bool {
|
|
|
return false
|
|
return false
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- reporter := &MQTTReporter{
|
|
|
|
|
|
|
+ reporter = &MQTTReporter{
|
|
|
config: config,
|
|
config: config,
|
|
|
clients: make(map[string]*Client),
|
|
clients: make(map[string]*Client),
|
|
|
ctx: ctx,
|
|
ctx: ctx,
|
|
@@ -61,16 +61,14 @@ func ModuleInit() bool {
|
|
|
dataBackfillTasks: make(map[string]*singletask.OnceTask),
|
|
dataBackfillTasks: make(map[string]*singletask.OnceTask),
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- Reporter = reporter
|
|
|
|
|
-
|
|
|
|
|
// 1, 客户端连接服务器 /////////////////////////////////////////////
|
|
// 1, 客户端连接服务器 /////////////////////////////////////////////
|
|
|
reporter.initMQTTClients()
|
|
reporter.initMQTTClients()
|
|
|
|
|
|
|
|
// 2, 启动数据上报任务 /////////////////////////////////////////////
|
|
// 2, 启动数据上报任务 /////////////////////////////////////////////
|
|
|
- reporter.StartDataWorker()
|
|
|
|
|
|
|
+ reporter.startDataWorker()
|
|
|
|
|
|
|
|
// 3, 启动照片上报任务 /////////////////////////////////////////////
|
|
// 3, 启动照片上报任务 /////////////////////////////////////////////
|
|
|
- reporter.StartImagWorker()
|
|
|
|
|
|
|
+ reporter.startImagWorker()
|
|
|
|
|
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
@@ -149,15 +147,15 @@ func (r *MQTTReporter) startYFKJDataBackfill(server MQTTServer) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func ModuleExit() {
|
|
func ModuleExit() {
|
|
|
- if Reporter == nil {
|
|
|
|
|
|
|
+ if reporter == nil {
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- reporter := Reporter
|
|
|
|
|
- Reporter = nil
|
|
|
|
|
- reporter.cancel()
|
|
|
|
|
|
|
+ r := reporter
|
|
|
|
|
+ reporter = nil
|
|
|
|
|
+ r.cancel()
|
|
|
|
|
|
|
|
- for _, client := range reporter.clients {
|
|
|
|
|
|
|
+ for _, client := range r.clients {
|
|
|
client.Close()
|
|
client.Close()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|