X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.c;h=e0e382488c1d1fc39895c2ea29d791ad55aa1ec7;hb=a63851bb4726c89d9a3c5755d78d1c4bbc3f3b2e;hp=53811c0017fb2d10ba353239b6fa95716237f796;hpb=be4e0e2d3855ccbd3b683bfe6cc4c7f9d3254314;p=src%2Fapp-framework-binder.git

diff --git a/src/verbose.c b/src/verbose.c
index 53811c00..e0e38248 100644
--- 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,8 +51,43 @@ 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;
+
+static int appauthority;
+
 static const char *prefixes[] = {
 	"<0> EMERGENCY",
 	"<1> ALERT",
@@ -59,29 +99,49 @@ 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)
 {
-	fprintf(stderr, "%s: ", prefixes[LEVEL(level)]);
+	int saverr = errno;
+	int tty = isatty(fileno(stderr));
+	errno = saverr;
+
+	fprintf(stderr, "%s: ", prefixes[CROP_LOGLEVEL(loglevel)] + (tty ? 4 : 0));
 	vfprintf(stderr, fmt, args);
-	if (file != NULL)
-		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");
 }
 
 void verbose_set_name(const char *name, int authority)
 {
-	fprintf(stderr, "%s: application name is '%s' for '%s'\n", prefixes[5], name, authority ? "AUTHORITY" : "USER");
+	appname = name;
+	appauthority = 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);
+	}
+}
+