projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.21.
[tinc]
/
src
/
logger.c
diff --git
a/src/logger.c
b/src/logger.c
index
871f2c1
..
6765cc5
100644
(file)
--- a/
src/logger.c
+++ b/
src/logger.c
@@
-1,7
+1,7
@@
/*
logger.c -- logging code
/*
logger.c -- logging code
- Copyright (C) 200
3 Guus Sliepen <guus@sliepen.eu
.org>
- 200
3 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 200
4-2006 Guus Sliepen <guus@tinc-vpn
.org>
+ 200
4-2005 Ivo Timmermans
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
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
@@
-13,11
+13,9
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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.7 2003/07/29 10:50:15 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 "system.h"
@@
-30,6
+28,9
@@
static logmode_t logmode = LOGMODE_STDERR;
static pid_t logpid;
extern char *logfilename;
static FILE *logfile = NULL;
static pid_t logpid;
extern char *logfilename;
static FILE *logfile = NULL;
+#ifdef HAVE_MINGW
+static HANDLE loghandle = NULL;
+#endif
static const char *logident = NULL;
void openlogger(const char *ident, logmode_t mode) {
static const char *logident = NULL;
void openlogger(const char *ident, logmode_t mode) {
@@
-43,21
+44,48
@@
void openlogger(const char *ident, logmode_t mode) {
case LOGMODE_FILE:
logpid = getpid();
logfile = fopen(logfilename, "a");
case LOGMODE_FILE:
logpid = getpid();
logfile = fopen(logfilename, "a");
- if(!logfile)
+ if(!logfile) {
+ fprintf(stderr, "Could not open log file %s: %s\n", logfilename, strerror(errno));
logmode = LOGMODE_NULL;
logmode = LOGMODE_NULL;
+ }
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+ loghandle = RegisterEventSource(NULL, logident);
+ if(!loghandle) {
+ fprintf(stderr, "Could not open log handle!");
+ logmode = LOGMODE_NULL;
+ }
+ break;
+#else
#ifdef HAVE_SYSLOG_H
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
#ifdef HAVE_SYSLOG_H
openlog(logident, LOG_CONS | LOG_PID, LOG_DAEMON);
break;
+#endif
#endif
case LOGMODE_NULL:
break;
}
}
#endif
case LOGMODE_NULL:
break;
}
}
+void reopenlogger() {
+ if(logmode != LOGMODE_FILE)
+ return;
+
+ fflush(logfile);
+ FILE *newfile = fopen(logfilename, "a");
+ if(!newfile) {
+ logger(LOG_ERR, "Unable to reopen log file %s: %s", logfilename, strerror(errno));
+ return;
+ }
+ fclose(logfile);
+ logfile = newfile;
+}
+
void logger(int priority, const char *format, ...) {
va_list ap;
void logger(int priority, const char *format, ...) {
va_list ap;
+ char timestr[32] = "";
+ time_t now;
va_start(ap, format);
va_start(ap, format);
@@
-65,13
+93,25
@@
void logger(int priority, const char *format, ...) {
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
case LOGMODE_STDERR:
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
+ fflush(stderr);
break;
case LOGMODE_FILE:
break;
case LOGMODE_FILE:
- fprintf(logfile, "%ld %s[%d]: ", time(NULL), logident, logpid);
+ now = time(NULL);
+ strftime(timestr, sizeof timestr, "%Y-%m-%d %H:%M:%S", localtime(&now));
+ fprintf(logfile, "%s %s[%ld]: ", timestr, logident, (long)logpid);
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
vfprintf(logfile, format, ap);
fprintf(logfile, "\n");
+ fflush(logfile);
break;
case LOGMODE_SYSLOG:
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+ {
+ char message[4096];
+ const char *messages[] = {message};
+ vsnprintf(message, sizeof(message), format, ap);
+ ReportEvent(loghandle, priority, 0, 0, NULL, 1, 0, messages, NULL);
+ }
+#else
#ifdef HAVE_SYSLOG_H
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
#ifdef HAVE_SYSLOG_H
#ifdef HAVE_VSYSLOG
vsyslog(priority, format, ap);
@@
-83,6
+123,7
@@
void logger(int priority, const char *format, ...) {
}
#endif
break;
}
#endif
break;
+#endif
#endif
case LOGMODE_NULL:
break;
#endif
case LOGMODE_NULL:
break;
@@
-97,9
+138,14
@@
void closelogger(void) {
fclose(logfile);
break;
case LOGMODE_SYSLOG:
fclose(logfile);
break;
case LOGMODE_SYSLOG:
+#ifdef HAVE_MINGW
+ DeregisterEventSource(loghandle);
+ break;
+#else
#ifdef HAVE_SYSLOG_H
closelog();
break;
#ifdef HAVE_SYSLOG_H
closelog();
break;
+#endif
#endif
case LOGMODE_NULL:
case LOGMODE_STDERR:
#endif
case LOGMODE_NULL:
case LOGMODE_STDERR: