X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.c;h=2045bde172bb7cf928c138eb9e14819618e95f75;hb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;hp=ad5d265a25a38d1791f2ec96d58236524f4d3476;hpb=e2de563d1ecb4585ce68521bd42f3ef45ac79f16;p=src%2Fapp-framework-main.git

diff --git a/src/verbose.c b/src/verbose.c
index ad5d265..2045bde 100644
--- a/src/verbose.c
+++ b/src/verbose.c
@@ -1,5 +1,7 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2016, 2017 "IoT.bzh"
+
+ author: José Bollo <jose.bollo@iot.bzh>
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -14,14 +16,81 @@
  limitations under the License.
 */
 
+#include <stdio.h>
+#include <stdarg.h>
+
 #include "verbose.h"
 
-#if !defined(NDEBUG)
 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 *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]", p, file, line);
+		free(p);
+	}
+}
+
+void verbose_set_name(const char *name, int authority)
+{
+	openlog(name, LOG_PERROR, authority ? LOG_AUTH : LOG_USER);
+}
+
 #else
-void verbose_error(const char *file, int line)
+
+#include <unistd.h>
+
+static const char *appname;
+
+static int appauthority;
+
+static const char *prefixes[] = {
+	"<0> EMERGENCY",
+	"<1> ALERT",
+	"<2> CRITICAL",
+	"<3> ERROR",
+	"<4> WARNING",
+	"<5> NOTICE",
+	"<6> INFO",
+	"<7> DEBUG"
+};
+
+void vverbose(int level, const char *file, int line, const char *fmt, va_list args)
 {
-	ERROR("error file %s line %d", file, line);
+	int tty = isatty(fileno(stderr));
+
+	fprintf(stderr, "%s: ", prefixes[LEVEL(level)] + (tty ? 4 : 0));
+	vfprintf(stderr, fmt, args);
+	if (file != NULL && (!tty || verbosity >5))
+		fprintf(stderr, " [%s:%d]\n", file, line);
+	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 *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vverbose(level, file, line, fmt, ap);
+	va_end(ap);
+}
+