Make logger a global object instead of an instance

Passing Logger object into every function isn't fun. See for yourself:
something as simple as a public key printing function turns from
>void print_public_key(const uint8_t *public_key)
to
>void print_public_key(Logger *logger, const uint8_t *public_key)
This commit is contained in:
Maxim Biro 2015-12-31 01:24:31 -05:00
parent bfc3c4eaac
commit c50781a2b7
2 changed files with 37 additions and 36 deletions

View File

@ -21,7 +21,7 @@
* *
*/ */
#include "logger.h" #include "log.h"
#include "global.h" #include "global.h"
@ -30,34 +30,36 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
typedef struct Logger { LOGGER_BACKEND current_backend = -1;
LOGGER_BACKEND backend;
} Logger;
Logger* new_logger(LOGGER_BACKEND backend) bool open_log(LOGGER_BACKEND backend)
{ {
if (current_backend != -1) {
return false;
}
if (backend == LOGGER_BACKEND_SYSLOG) { if (backend == LOGGER_BACKEND_SYSLOG) {
openlog(DAEMON_NAME, LOG_NOWAIT | LOG_PID, LOG_DAEMON); openlog(DAEMON_NAME, LOG_NOWAIT | LOG_PID, LOG_DAEMON);
} }
Logger* logger = malloc(sizeof(Logger)); current_backend = backend;
if (logger == NULL) { return true;
return NULL;
}
logger->backend = backend;
return logger;
} }
void kill_logger(Logger* logger) bool close_log()
{ {
if (backend == LOGGER_BACKEND_SYSLOG) { if (current_backend == -1) {
return false;
}
if (current_backend == LOGGER_BACKEND_SYSLOG) {
closelog(); closelog();
} }
free(logger); current_backend = -1;
return true;
} }
int level_syslog(LOG_LEVEL level) int level_syslog(LOG_LEVEL level)
@ -85,7 +87,6 @@ FILE* level_stdout(LOG_LEVEL level)
case LOG_LEVEL_WARNING: // intentional fallthrough case LOG_LEVEL_WARNING: // intentional fallthrough
case LOG_LEVEL_ERROR: case LOG_LEVEL_ERROR:
return stderr; return stderr;
} }
} }
@ -94,12 +95,12 @@ void log_stdout(LOG_LEVEL level, const char *format, va_list args)
vfprintf(level_stdout(level), format, args); vfprintf(level_stdout(level), format, args);
} }
void log(Logger* logger, LOG_LEVEL level, const char *format, ...) bool log(LOG_LEVEL level, const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
switch (logger->backend) { switch (current_backend) {
case LOGGER_BACKEND_SYSLOG: case LOGGER_BACKEND_SYSLOG:
log_syslog(level, format, args); log_syslog(level, format, args);
break; break;
@ -109,4 +110,6 @@ void log(Logger* logger, LOG_LEVEL level, const char *format, ...)
} }
va_end(args); va_end(args);
return current_backend != -1;
} }

View File

@ -1,4 +1,4 @@
/* logger.h /* log.h
* *
* Tox DHT bootstrap daemon. * Tox DHT bootstrap daemon.
* *
@ -21,8 +21,8 @@
* *
*/ */
#ifndef LOGGER_H #ifndef LOG_H
#define LOGGER_H #define LOG_H
typedef enum LOGGER_BACKEND { typedef enum LOGGER_BACKEND {
LOGGER_BACKEND_SYSLOG, LOGGER_BACKEND_SYSLOG,
@ -35,29 +35,27 @@ typedef enum LOG_LEVEL {
LOG_LEVEL_ERROR LOG_LEVEL_ERROR
} LOG_LEVEL; } LOG_LEVEL;
typedef struct Logger Logger; /**
* Initializes logger.
* @param backend Specifies which backend to use.
* @return true on success, flase if log is already opened.
*/
bool open_log(LOGGER_BACKEND backend);
/** /**
* Creates new logger. * Releases all used resources by the logger.
* @param backend Specifies which backend the logger should use. * @return true on success, flase if log is already closed.
* @return Logger object on success, NULL on failure.
*/ */
Logger* new_logger(LOGGER_BACKEND backend); bool close_log();
/**
* Destroys a logger object, releasing all used resources.
* @param logger Logger object to destroy.
*/
void kill_logger(Logger* logger);
/** /**
* Logs a message. * Logs a message.
* @param logger Logger object to use.
* @param level Log level to use. * @param level Log level to use.
* @param format printf-like format string. * @param format printf-like format string.
* @param ... Zero or more arguments, similar to printf function. * @param ... Zero or more arguments, similar to printf function.
* @return true on success, flase if log is closed.
*/ */
void log(Logger* logger, LOG_LEVEL level, const char *format, ...); bool log(LOG_LEVEL level, const char *format, ...);
#endif // LOGGER_H #endif // LOG_H