hooking: Add hook at global scope

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

diff --git a/src/verbose.c b/src/verbose.c
index a91aeb1..e0e3824 100644 (file)
--- a/src/verbose.c
+++ b/src/verbose.c
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 "IoT.bzh"
+ Copyright (C) 2016, 2017 "IoT.bzh"
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -21,22 +21,27 @@
 
 #include "verbose.h"
 
+#if !defined(DEFAULT_VERBOSITY)
+# define DEFAULT_VERBOSITY Verbosity_Level_Warning
+#endif
+
 int verbosity = 1;
+void (*verbose_observer)(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args);
 
-#define LEVEL(x) ((x) < 0 ? 0 : (x) > 7 ? 7 : (x))
+#define CROP_LOGLEVEL(x) ((x) < Log_Level_Emergency ? Log_Level_Emergency : (x) > Log_Level_Debug ? Log_Level_Debug : (x))
 
 #if defined(VERBOSE_WITH_SYSLOG)
 
 #include <syslog.h>
 
-void vverbose(int level, const char *file, int line, const char *fmt, va_list args)
+static void _vverbose_(int loglevel, 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);
+               vsyslog(loglevel, fmt, args);
        else {
-               syslog(LEVEL(level), "%s [%s:%d]", p, file, line);
+               syslog(CROP_LOGLEVEL(loglevel), "%s [%s:%d, function]", p, file, line, function);
                free(p);
        }
 }
@@ -46,9 +51,38 @@ 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;
+
+static void _vverbose_(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       char lino[20];
+
+       if (file == NULL) {
+               sd_journal_printv(loglevel, fmt, args);
+       } else {
+               sprintf(lino, "%d", line);
+               sd_journal_printv_with_location(loglevel, file, lino, function, fmt, args);
+       }
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+       appname = name;
+       appauthority = authority;
+}
+
 #else
 
 #include <unistd.h>
+#include <errno.h>
 
 static const char *appname;
 
@@ -65,14 +99,16 @@ static const char *prefixes[] = {
        "<7> DEBUG"
 };
 
-void vverbose(int level, const char *file, int line, const char *fmt, va_list args)
+static void _vverbose_(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args)
 {
+       int saverr = errno;
        int tty = isatty(fileno(stderr));
+       errno = saverr;
 
-       fprintf(stderr, "%s: ", prefixes[LEVEL(level)] + (tty ? 4 : 0));
+       fprintf(stderr, "%s: ", prefixes[CROP_LOGLEVEL(loglevel)] + (tty ? 4 : 0));
        vfprintf(stderr, fmt, args);
-       if (file != NULL && (!tty || verbosity >5))
-               fprintf(stderr, " [%s:%d]\n", file, line);
+       if (file != NULL && (!tty || verbosity > 2))
+               fprintf(stderr, " [%s:%d,%s]\n", file, line, function);
        else
                fprintf(stderr, "\n");
 }
@@ -85,12 +121,27 @@ void verbose_set_name(const char *name, int authority)
 
 #endif
 
-void verbose(int level, const char *file, int line, const char *fmt, ...)
+void verbose(int loglevel, const char *file, int line, const char *function, const char *fmt, ...)
 {
        va_list ap;
 
        va_start(ap, fmt);
-       vverbose(level, file, line, fmt, ap);
+       vverbose(loglevel, file, line, function, fmt, ap);
        va_end(ap);
 }
 
+void vverbose(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+       void (*observer)(int loglevel, const char *file, int line, const char *function, const char *fmt, va_list args) = verbose_observer;
+
+       if (!observer)
+               _vverbose_(loglevel, file, line, function, fmt, args);
+       else {
+               va_list ap;
+               va_copy(ap, args);
+               _vverbose_(loglevel, file, line, function, fmt, args);
+               observer(loglevel, file, line, function, fmt, ap);
+               va_end(ap);
+       }
+}
+