X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.c;h=53811c0017fb2d10ba353239b6fa95716237f796;hb=8fd6083ae84d3da225596287f5c12f87b5fad7eb;hp=29d2a9e647c23a179f0cb190046bfd655feb011c;hpb=7ea1657b459aea2cc6ef9332621a19d7e2676b1d;p=src%2Fapp-framework-binder.git diff --git a/src/verbose.c b/src/verbose.c index 29d2a9e6..53811c00 100644 --- a/src/verbose.c +++ b/src/verbose.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright (C) 2016 "IoT.bzh" author: José Bollo @@ -18,10 +18,36 @@ #include #include + #include "verbose.h" int verbosity = 1; +#define LEVEL(x) ((x) < 0 ? 0 : (x) > 7 ? 7 : (x)) + +#if defined(VERBOSE_WITH_SYSLOG) + +#include + +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 + static const char *prefixes[] = { "<0> EMERGENCY", "<1> ALERT", @@ -33,13 +59,29 @@ static const char *prefixes[] = { "<7> DEBUG" }; +void vverbose(int level, const char *file, int line, const char *fmt, va_list args) +{ + fprintf(stderr, "%s: ", prefixes[LEVEL(level)]); + vfprintf(stderr, fmt, args); + if (file != NULL) + fprintf(stderr, " [%s:%d]\n", file, line); + 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"); +} + +#endif + void verbose(int level, const char *file, int line, 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, fmt, ap); va_end(ap); - fprintf(stderr, " [%s:%d]\n", file, line); } +