Skip to content

Commit

Permalink
add minimal logging framework
Browse files Browse the repository at this point in the history
  • Loading branch information
poettering committed Jan 20, 2010
1 parent 6a66a1a commit 5899f3b
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CFLAGS=-Wall -Wextra -O0 -g -pipe -D_GNU_SOURCE -fdiagnostics-show-option -Wno-unused-parameter
LIBS=-lrt

COMMON=name.o util.o set.o hashmap.o strv.o job.o manager.o conf-parser.o load-fragment.o socket-util.c
COMMON=name.o util.o set.o hashmap.o strv.o job.o manager.o conf-parser.o load-fragment.o socket-util.o log.o

all: systemd test-engine

Expand Down
38 changes: 38 additions & 0 deletions log.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <stdarg.h>
#include <stdio.h>

#include "log.h"

void log_meta(
int level,
const char*file,
int line,
const char *func,
const char *format, ...) {

const char *prefix, *suffix;
va_list ap;

if (LOG_PRI(level) <= LOG_ERR) {
prefix = "\x1B[1;31m";
suffix = "\x1B[0m";
} else {
prefix = "";
suffix = "";
}

va_start(ap, format);

fprintf(stderr, "(%s:%u) %s", file, line, prefix);
vfprintf(stderr, format, ap);
fprintf(stderr, "%s\n", suffix);

va_end(ap);

}
23 changes: 23 additions & 0 deletions log.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/

#ifndef foologhfoo
#define foologhfoo

#include <syslog.h>

#include "macro.h"

void log_meta(
int level,
const char*file,
int line,
const char *func,
const char *format, ...) __printf_attr(5,6);

#define log_debug(...) log_meta(LOG_DEBUG, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_info(...) log_meta(LOG_INFO, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_notice(...) log_meta(LOG_NOTICE, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__, __VA_ARGS__)

#endif

0 comments on commit 5899f3b

Please sign in to comment.