github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-08-23 11:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for specifying optional clientid [-i]

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-08-19 17:36:23 +02:00
parent a0dd167a32
commit 306d9b7d5c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ot-recorder.c
+16 -9
View File
@@ -603,7 +603,7 @@ static void catcher(int sig)
void usage(char *prog)
{
fprintf(stderr, "Usage: %s [-D] [-F] [-G] [-N] [-P prefix] [-R] topic [topic...]\n", prog);
fprintf(stderr, "Usage: %s [-D] [-F] [-G] [-i clientid] [-N] [-P prefix] [-R] topic [topic...]\n", prog);
exit(2);
}
@@ -628,7 +628,14 @@ int main(int argc, char **argv)
udata.skipdemo = TRUE;
udata.useredis = TRUE;
while ((ch = getopt(argc, argv, "DFGRNP:")) != EOF) {
utstring_new(clientid);
utstring_printf(clientid, "ot-recorder");
if (uname(&uts) == 0) {
utstring_printf(clientid, "-%s", uts.nodename);
}
utstring_printf(clientid, "-%d", getpid());
while ((ch = getopt(argc, argv, "DFGi:RNP:")) != EOF) {
switch (ch) {
case 'D':
ud->skipdemo = FALSE;
@@ -639,6 +646,10 @@ int main(int argc, char **argv)
case 'G':
ud->revgeo = FALSE;
break;
case 'i':
utstring_clear(clientid);
utstring_printf(clientid, "%s", optarg);
break;
case 'N':
ud->useredis = FALSE;
break;
@@ -670,17 +681,13 @@ int main(int argc, char **argv)
port = atoi(p);
}
revgeo_init();
if (ud->revgeo == TRUE) {
revgeo_init();
}
utstring_new(clientid);
mosquitto_lib_init();
utstring_printf(clientid, "ot-recorder");
if (uname(&uts) == 0) {
utstring_printf(clientid, "-%s", uts.nodename);
}
utstring_printf(clientid, "-%d", getpid());
signal(SIGINT, catcher);