Bindings V2: Remove explicit references to daemon/service

[src/app-framework-binder.git] / src / verbose.c

diff --git a/src/verbose.c b/src/verbose.c
index 3f971ce..5b2611a 100644 (file)
--- a/src/verbose.c
+++ b/src/verbose.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2016, 2017 "IoT.bzh"
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -23,6 +23,65 @@
 
 int verbosity = 1;
 
+#define LEVEL(x) ((x) < 0 ? 0 : (x) > 7 ? 7 : (x))
+
+#if defined(VERBOSE_WITH_SYSLOG)
+
+#include <syslog.h>
+
+void vverbose(int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       char *p;
+
+       if (file == NULL || vasprintf(&p, fmt, args) < 0)
+               vsyslog(level, fmt, args);
+       else {
+               syslog(LEVEL(level), "%s [%s:%d, function]", p, file, line, function);
+               free(p);
+       }
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+       openlog(name, LOG_PERROR, authority ? LOG_AUTH : LOG_USER);
+}
+
+#elif defined(VERBOSE_WITH_SYSTEMD)
+
+#define SD_JOURNAL_SUPPRESS_LOCATION
+
+#include <systemd/sd-journal.h>
+
+static const char *appname;
+
+static int appauthority;
+
+void vverbose(int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       char lino[20];
+
+       if (file == NULL) {
+               sd_journal_printv(level, fmt, args);
+       } else {
+               sprintf(lino, "%d", line);
+               sd_journal_printv_with_location(level, file, lino, function, fmt, args);
+       }
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+       appname = name;
+       appauthority = authority;
+}
+
+#else
+
+#include <unistd.h>
+
+static const char *appname;
+
+static int appauthority;
+
 static const char *prefixes[] = {
        "<0> EMERGENCY",
        "<1> ALERT",
@@ -34,13 +93,32 @@ static const char *prefixes[] = {
        "<7> DEBUG"
 };
 
-void verbose(int level, const char *file, int line, const char *fmt, ...)
+void vverbose(int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       int tty = isatty(fileno(stderr));
+
+       fprintf(stderr, "%s: ", prefixes[LEVEL(level)] + (tty ? 4 : 0));
+       vfprintf(stderr, fmt, args);
+       if (file != NULL && (!tty || verbosity > 2))
+               fprintf(stderr, " [%s:%d,%s]\n", file, line, function);
+       else
+               fprintf(stderr, "\n");
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+       appname = name;
+       appauthority = authority;
+}
+
+#endif
+
+void verbose(int level, const char *file, int line, const char *function, const char *fmt, ...)
 {
        va_list ap;
 
-       fprintf(stderr, "%s: ", prefixes[level < 0 ? 0 : level > 7 ? 7 : level]);
        va_start(ap, fmt);
-       vfprintf(stderr, fmt, ap);
+       vverbose(level, file, line, function, fmt, ap);
        va_end(ap);
-       fprintf(stderr, " [%s:%d]\n", file, line);
 }
+