| @@ -48,8 +48,6 @@ func main() { | |||||
| Network: "tcp", | Network: "tcp", | ||||
| Address: cfg.MQTTHost, | Address: cfg.MQTTHost, | ||||
| ClientID: []byte(cfg.MQTTClientID), | ClientID: []byte(cfg.MQTTClientID), | ||||
| // UserName: nil, | |||||
| // Password: nil, | |||||
| UserName: []byte(cfg.MQTTUser), | UserName: []byte(cfg.MQTTUser), | ||||
| Password: []byte(cfg.MQTTPass), | Password: []byte(cfg.MQTTPass), | ||||
| }) | }) | ||||
| @@ -92,6 +90,7 @@ func main() { | |||||
| msgStr := string(message) | msgStr := string(message) | ||||
| t := strings.Split(string(topicName), "/") | t := strings.Split(string(topicName), "/") | ||||
| hostname := t[1] | hostname := t[1] | ||||
| fmt.Println("hostname: ", hostname) | |||||
| if strings.HasPrefix(msgStr, "[") { | if strings.HasPrefix(msgStr, "[") { | ||||
| var readings []model.RawReading | var readings []model.RawReading | ||||
| @@ -22,8 +22,8 @@ func getEnv(key, def string) string { | |||||
| func Load() *Config { | func Load() *Config { | ||||
| return &Config{ | return &Config{ | ||||
| HTTPAddr: getEnv("HTTP_HOST_PATH", "0.0.0.0:8080"), | |||||
| WSAddr: getEnv("HTTPWS_HOST_PATH", "0.0.0.0:8088"), | |||||
| HTTPAddr: getEnv("HTTP_HOST_PATH", "0.0.0.0:1902"), | |||||
| WSAddr: getEnv("HTTPWS_HOST_PATH", "0.0.0.0:1922"), | |||||
| MQTTHost: getEnv("MQTT_HOST", "localhost:1883"), | MQTTHost: getEnv("MQTT_HOST", "localhost:1883"), | ||||
| MQTTUser: getEnv("MQTT_USERNAME", "chesnek"), | MQTTUser: getEnv("MQTT_USERNAME", "chesnek"), | ||||
| MQTTPass: getEnv("MQTT_PASSWORD", "chesnek"), | MQTTPass: getEnv("MQTT_PASSWORD", "chesnek"), | ||||
| @@ -71,16 +71,10 @@ func StartHTTPServer(addr string, ctx *model.AppContext) { | |||||
| go handleMessages(ctx.Clients, &ctx.Broadcast) | go handleMessages(ctx.Clients, &ctx.Broadcast) | ||||
| go func() { | |||||
| log.Fatal(http.ListenAndServe(addr, nil)) | |||||
| }() | |||||
| http.ListenAndServe(addr, handlers.CORS(originsOk, headersOk, methodsOk)(r)) | http.ListenAndServe(addr, handlers.CORS(originsOk, headersOk, methodsOk)(r)) | ||||
| } | } | ||||
| // TODO: rather add defer to unlock the files | |||||
| func resultsHandler(httpResults *model.HTTPResultsList) http.HandlerFunc { | func resultsHandler(httpResults *model.HTTPResultsList) http.HandlerFunc { | ||||
| return func(w http.ResponseWriter, r *http.Request) { | return func(w http.ResponseWriter, r *http.Request) { | ||||
| httpResults.HTTPResultsLock.Lock() | httpResults.HTTPResultsLock.Lock() | ||||
| @@ -1,6 +1,7 @@ | |||||
| package mqtt_client | package mqtt_client | ||||
| import ( | import ( | ||||
| "fmt" | |||||
| "log" | "log" | ||||
| "time" | "time" | ||||
| @@ -38,8 +39,8 @@ func processIncoming(incoming model.Incoming_json, cl *client.Client, ctx *model | |||||
| } | } | ||||
| }() | }() | ||||
| incoming = incomingBeaconFilter(incoming) // DONE | |||||
| id := getBeaconID(incoming) // DONE | |||||
| incoming = incomingBeaconFilter(incoming) | |||||
| id := getBeaconID(incoming) | |||||
| now := time.Now().Unix() | now := time.Now().Unix() | ||||
| beacons := &ctx.Beacons | beacons := &ctx.Beacons | ||||
| @@ -52,10 +53,11 @@ func processIncoming(incoming model.Incoming_json, cl *client.Client, ctx *model | |||||
| beacon, ok := beacons.Beacons[id] | beacon, ok := beacons.Beacons[id] | ||||
| if !ok { | if !ok { | ||||
| updateLatestList(incoming, now, latestList) // DONE | |||||
| fmt.Println("updating latest list") | |||||
| updateLatestList(incoming, now, latestList) | |||||
| return | return | ||||
| } | } | ||||
| fmt.Println("updating beacon data") | |||||
| updateBeaconData(&beacon, incoming, now, cl, settings) | updateBeaconData(&beacon, incoming, now, cl, settings) | ||||
| beacons.Beacons[beacon.Beacon_id] = beacon | beacons.Beacons[beacon.Beacon_id] = beacon | ||||
| } | } | ||||