cotugno/recorder
2
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2024-11-15 18:08:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

implement topic2tid

Browse Source 
closes #38
This commit is contained in:
Jan-Piet Mens 2015-09-24 13:18:16 +02:00
parent 3edd9c2923
commit b4498b496e
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -540,3 +540,7 @@ server {
### The LMDB database
`ocat --load` and `ocat --dump` can be use to load and dump the lmdb database respectively. There is some support for loading/dumping named databases using `--load=xx` or `--dump=xx` to specify the name. Use the mdb utilities to actually perform backups of these.
#### `topic2tid`
This named lmdb database is keyed on topic name (`owntracks/jane/phone`). If the topic of an incoming message is found in the database, the `tid` member in the JSON payload is replaced by the value of this key.

28
ot-recorder.c
View File

@ -451,6 +451,24 @@ void on_message(struct mosquitto *mosq, void *userdata, const struct mosquitto_m
}
}
#ifdef HAVE_LMDB
/*
* If the topic we are handling is in topic2tid, replace the TID
* in this payload with that from the database.
*/
if (ud->t2t) {
char newtid[BUFSIZ];
long blen;
if ((blen = gcache_get(ud->t2t, m->topic, newtid, sizeof(newtid))) > 0) {
if ((j = json_find_member(json, "tid")) != NULL)
json_remove_from_parent(j);
json_append_member(json, "tid", json_mkstring(newtid));
}
}
#endif
/*
* Chances are high that what we have now contains lat, lon. Attempt to
* perform or retrieve reverse-geo.
@ -735,6 +753,7 @@ int main(int argc, char **argv)
udata.verbose = TRUE;
#ifdef HAVE_LMDB
udata.gc = NULL;
udata.t2t = NULL; /* Topic to TID */
#endif
#ifdef HAVE_HTTP
udata.mgserver = NULL;
@ -953,6 +972,10 @@ int main(int argc, char **argv)
revgeo_init();
}
#ifdef HAVE_LMDB
snprintf(err, sizeof(err), "%s/ghash", STORAGEDIR);
ud->t2t = gcache_open(err, "topic2tid", TRUE);
#endif
mosquitto_lib_init();
@ -1074,6 +1097,11 @@ int main(int argc, char **argv)
json_delete(ud->topics);
#ifdef HAVE_LMDB
if (ud->t2t)
gcache_close(ud->t2t);
#endif
#ifdef HAVE_HTTP
mg_destroy_server(&udata.mgserver);
#endif

1
udata.h
View File

@ -21,6 +21,7 @@ struct udata {
int verbose; /* TRUE if print verbose messages to stdout */
#ifdef HAVE_LMDB
struct gcache *gc;
struct gcache *t2t; /* topic to tid */
#endif
#ifdef HAVE_HTTP
struct mg_server *mgserver; /* Mongoose */