X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fverbose.c;h=a91aeb1f02d2f3ca62fd463d1b8b8a6b0a639124;hb=c94e1ef88adc641ebbab57377b97f8a7b6a70d1b;hp=3f971ce35e7ad6b60a046416d34253673336eaf1;hpb=6721f5c4220d4d46c18b8d86c2195ff439a74155;p=src%2Fapp-framework-binder.git diff --git a/src/verbose.c b/src/verbose.c index 3f971ce3..a91aeb1f 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 @@ -23,6 +23,37 @@ 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 + +#include + +static const char *appname; + +static int appauthority; + static const char *prefixes[] = { "<0> EMERGENCY", "<1> ALERT", @@ -34,13 +65,32 @@ static const char *prefixes[] = { "<7> DEBUG" }; +void vverbose(int level, const char *file, int line, 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 >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; - 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); } +