-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
Log_fatal("Failed to open log file '%s' for writing: %s\n", logfilename, strerror(errno));
}
+ /* Set the stream as line buffered */
+ if (setvbuf(logfile, NULL, _IOLBF, 0) < 0)
+ Log_fatal("setvbuf() failed: %s\n", strerror(errno));
+
/* XXX - Is it neccessary/appropriate that logging to file is non-blocking?
* If not, there's a risk that execution blocks, meaning that voice blocks
* as well since uMurmur is single threaded by design. OTOH, what could
- * cause a block? If the disk causes blocking, it is probably br0ken. but
+ * cause a block? If the disk causes blocking, it is probably br0ken, but
* the log could be on a nfs or smb share, so let's set it up as
* non-blocking and we'll see what happens.
*/
fcntl(fd, F_SETFL, flags | O_NONBLOCK);
}
+static char *timestring(void)
+{
+ static char timebuf[32];
+ time_t t;
+ struct tm *timespec;
+
+ t= time(NULL);
+ timespec = localtime(&t);
+ strftime(timebuf, 32, "%b %e %T", timespec);
+ return timebuf;
+}
+
void Log_init(bool_t terminal)
{
const char *logfilename;
-
- termprint = terminal;
+
+ termprint = terminal;
if (termprint)
return;
-
+
logfilename = getStrConf(LOGFILE);
if (logfilename != NULL) {
openlogfile(logfilename);
return;
else if (logfile)
fclose(logfile);
- else
+ else
closelog();
}
-
+
void Log_reset()
{
const char *logfilename;
-
+
if (logfile) {
logfilename = getStrConf(LOGFILE);
fclose(logfile);
{
va_list argp;
char buf[STRSIZE + 1];
-
+
va_start(argp, logstring);
vsnprintf(&buf[0], STRSIZE, logstring, argp);
va_end(argp);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
- fprintf(logfile, "%s\n", buf);
+ fprintf(logfile, "%s %s\n", timestring(), buf);
else
syslog(LOG_INFO, "%s", buf);
}
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
-
+
+ if (termprint || logfile)
+ offset = sprintf(buf, "WARN: ");
+
va_start(argp, logstring);
- offset = sprintf(buf, "WARN: ");
vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
- fprintf(logfile, "%s\n", buf);
+ fprintf(logfile, "%s %s\n", timestring(), buf);
else
syslog(LOG_WARNING, "%s", buf);
}
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
-
+
+ if (termprint || logfile)
+ offset = sprintf(buf, "INFO: ");
+
va_start(argp, logstring);
- offset = sprintf(buf, "INFO: ");
vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
- else if (logfile) {
- fprintf(logfile, "%s\n", buf);
- fflush(logfile);
- }
+ else if (logfile)
+ fprintf(logfile, "%s %s\n", timestring(), buf);
else
syslog(LOG_INFO, "%s", buf);
}
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
-
+ uint16_t port;
+
+ if (termprint || logfile)
+ offset = sprintf(buf, "INFO: ");
+
va_start(argp, logstring);
- offset = sprintf(buf, "INFO: ");
offset += vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
+
+ if(client->remote_tcp.ss_family == AF_INET)
+ port = ntohs(((struct sockaddr_in*)&client->remote_tcp)->sin_port);
+ else
+ port = ntohs(((struct sockaddr_in6*)&client->remote_tcp)->sin6_port);
+
offset += snprintf(&buf[offset], STRSIZE - offset, " - [%d] %s@%s:%d",
client->sessionId,
client->username == NULL ? "" : client->username,
- inet_ntoa(client->remote_tcp.sin_addr),
- ntohs(client->remote_tcp.sin_port));
+ client->addressString,
+ port);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
- fprintf(logfile, "%s\n", buf);
+ fprintf(logfile, "%s %s\n", timestring(), buf);
else
syslog(LOG_INFO, "%s", buf);
}
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
-
+
+ if (termprint || logfile)
+ offset = sprintf(buf, "DEBUG: ");
+
va_start(argp, logstring);
- offset = sprintf(buf, "DEBUG: ");
vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
- fprintf(logfile, "%s\n", buf);
+ fprintf(logfile, "%s %s\n", timestring(), buf);
else
syslog(LOG_DEBUG, "%s", buf);
}
va_list argp;
char buf[STRSIZE + 1];
int offset = 0;
+
+ if (termprint || logfile)
+ offset = sprintf(buf, "FATAL: ");
+
va_start(argp, logstring);
- offset = sprintf(buf, "FATAL: ");
vsnprintf(&buf[offset], STRSIZE - offset, logstring, argp);
va_end(argp);
+
if (termprint)
fprintf(stderr, "%s\n", buf);
else if (logfile)
- fprintf(logfile, "%s\n", buf);
- else { /* If logging subsystem is not initialized, fall back to syslog logging
- * for fatal errors. Only config file reading that needs this currently.
+ fprintf(logfile, "%s %s\n", timestring(), buf);
+ else { /* If logging subsystem is not initialized, fall back to stderr +
+ * syslog logging for fatal errors.
*/
- if (!init)
+ if (!init) {
openlog("uMurmurd", LOG_PID, LOG_DAEMON);
+ fprintf(stderr, "%s\n", buf);
+ }
syslog(LOG_CRIT, "%s", buf);
}
-
+
exit(1);
}
projects / umurmur.git / blobdiff