AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Include timestamps on USB connect/disconnect logging.

Browse source 
Fixes #21.
This commit is contained in:
Oliver Jowett 2015-02-17 21:40:26 +00:00
parent af4f81caf7
commit 342eafd438
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dump1090.c
View file

@ -49,12 +49,38 @@
#include "dump1090.h" #include "dump1090.h"
#include <stdarg.h>
static int verbose_device_search(char *s); static int verbose_device_search(char *s);
// //
// ============================= Utility functions ========================== // ============================= Utility functions ==========================
// //
void sigintHandler(int dummy) { void sigintHandler(int dummy) {
static void log_with_timestamp(const char *format, ...) __attribute__((format (printf, 1, 2) ));
static void log_with_timestamp(const char *format, ...)
{
char timebuf[128];
char msg[1024];
time_t now;
struct tm local;
va_list ap;
now = time(NULL);
localtime_r(&now, &local);
strftime(timebuf, 128, "%c %Z", &local);
timebuf[127] = 0;
va_start(ap, format);
vsnprintf(msg, 1024, format, ap);
va_end(ap);
msg[1023] = 0;
fprintf(stderr, "%s %s\n", timebuf, msg);
}
MODES_NOTUSED(dummy); MODES_NOTUSED(dummy);
signal(SIGINT, SIG_DFL); // reset signal handler - bit extra safety signal(SIGINT, SIG_DFL); // reset signal handler - bit extra safety
Modes.exit = 1; // Signal to threads that we are done Modes.exit = 1; // Signal to threads that we are done
@ -467,13 +493,13 @@ void *readerThreadEntryPoint(void *arg) {
MODES_ASYNC_BUF_SIZE); MODES_ASYNC_BUF_SIZE);
if (!Modes.exit) { if (!Modes.exit) {
fprintf(stderr, "Warning: lost the connection to the RTLSDR device.\n"); log_with_timestamp("Warning: lost the connection to the RTLSDR device.");
rtlsdr_close(Modes.dev); rtlsdr_close(Modes.dev);
Modes.dev = NULL; Modes.dev = NULL;
do { do {
sleep(5); sleep(5);
fprintf(stderr, "Trying to reconnect to the RTLSDR device..\n"); log_with_timestamp("Trying to reconnect to the RTLSDR device..");
} while (!Modes.exit && modesInitRTLSDR() < 0); } while (!Modes.exit && modesInitRTLSDR() < 0);
} }
} }