github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-05-07 02:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

send to WS for locations only

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-09-08 12:57:09 +02:00
parent 9b8b298527
commit 470de65821
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ot-recorder.c
View File

@@ -385,12 +385,6 @@ void on_message(struct mosquitto *mosq, void *userdata, const struct mosquitto_m
time(&now);
monitorhook(ud, now, m->topic);
#ifdef HAVE_HTTP
if (ud->mgserver) {
http_ws_push(ud->mgserver, m->payload);
}
#endif
if (m->payloadlen == 0) {
return;
}
@@ -551,6 +545,33 @@ void on_message(struct mosquitto *mosq, void *userdata, const struct mosquitto_m
* We have exactly three topic parts (owntracks/user/device), and valid JSON.
*/
#ifdef HAVE_HTTP
if (ud->mgserver) {
/*
* Create a new location object containing all the bits and
* pieces we need and push that into connected Websockets.
* TODO: clean up
*/
JsonNode *geo, *wso = json_mkobject();
char *js;
json_copy_to_object(wso, json, TRUE);
if ((geo = gcache_json_get(ud->gc, utstring_body(ghash))) != NULL) {
json_copy_to_object(wso, geo, FALSE);
json_delete(geo);
}
if ((js = json_stringify(wso, NULL)) != NULL) {
http_ws_push(ud->mgserver, m->payload);
free(js);
}
json_delete(wso);
}
#endif
if ((jsonstring = json_stringify(json, NULL)) != NULL) {
char *js;