/*
logger.c -- logging code
- Copyright (C) 2003 Guus Sliepen <guus@sliepen.eu.org>
- 2003 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id: logger.c,v 1.1.2.5 2003/07/22 20:55:19 guus Exp $
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "system.h"
-#include "conf.h"
#include "logger.h"
+#include "meshlink_internal.h"
+#include "sptps.h"
-debug_t debug_level = DEBUG_NOTHING;
-static logmode_t logmode = LOGMODE_STDERR;
-static pid_t logpid;
-extern char *logfilename;
-static FILE *logfile = NULL;
-static const char *logident = NULL;
-
-void openlogger(const char *ident, logmode_t mode) {
- logident = ident;
- logmode = mode;
-
- switch(mode) {
- case LOGMODE_NULL:
- break;
- case LOGMODE_STDERR:
- logpid = getpid();
- break;
- case LOGMODE_FILE:
- logpid = getpid();
- logfile = fopen(logfilename, "a");
- if(!logfile)
- logmode = LOGMODE_NULL;
- break;
- case LOGMODE_SYSLOG:
- openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
- break;
- }
-}
+// TODO: refactor logging code to use a meshlink_handle_t *.
+void logger(int level, int priority, const char *format, ...) {
+ //if(level > mesh->debug_level)
+ // return;
-void logger(int priority, const char *format, ...) {
va_list ap;
+ char message[1024] = "";
va_start(ap, format);
-
- switch(logmode) {
- case LOGMODE_NULL:
- break;
- case LOGMODE_STDERR:
- vfprintf(stderr, format, ap);
- fprintf(stderr, "\n");
- break;
- case LOGMODE_FILE:
- fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
- vfprintf(logfile, format, ap);
- fprintf(logfile, "\n");
- break;
- case LOGMODE_SYSLOG:
-#ifdef HAVE_VSYSLOG
- vsyslog(priority, format, ap);
-#else
- {
- char message[4096];
- vsnprintf(message, sizeof(message), format, ap);
- syslog(priority, "%s", message);
- }
-#endif
- break;
- }
-
+ int len = vsnprintf(message, sizeof message, format, ap);
va_end(ap);
-}
-void closelogger(void) {
- switch(logmode) {
- case LOGMODE_NULL:
- case LOGMODE_STDERR:
- break;
- case LOGMODE_FILE:
- fclose(logfile);
- break;
- case LOGMODE_SYSLOG:
- closelog();
- break;
- }
+ if(len > 0 && len < sizeof message && message[len - 1] == '\n')
+ message[len - 1] = 0;
+
+ fprintf(stderr, "%s\n", message);
}