-#include "log.h"
-
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stddef.h>
#include <stdio.h>
#include <string.h>
-#include <stdarg.h>
#include <syslog.h>
-#include <assert.h>
-#include <errno.h>
+#include <time.h>
#include <string>
#include <vector>
+#include "log.h"
+
using namespace std;
// Yes, it's a bit ugly.
vsnprintf(formatted_msg, sizeof(formatted_msg), fmt, ap);
va_end(ap);
+ time_t now = time(NULL);
+ struct tm lt;
+ struct tm *ltime = localtime_r(&now, <);
+ char timestamp[1024];
+ if (ltime == NULL) {
+ strcpy(timestamp, "???");
+ } else {
+ strftime(timestamp, sizeof(timestamp), "%a, %d %b %Y %T %z", ltime);
+ }
+
const char *log_level_str;
int syslog_level;
switch (log_level) {
- case NO_LEVEL:
- log_level_str = "";
- syslog_level = LOG_INFO;
- break;
case INFO:
- log_level_str = "INFO: ";
+ log_level_str = "INFO: ";
syslog_level = LOG_INFO;
break;
case WARNING:
syslog_level = LOG_WARNING;
break;
case ERROR:
- log_level_str = "ERROR: ";
+ log_level_str = "ERROR: ";
syslog_level = LOG_ERR;
break;
default:
// Log to stderr if logging hasn't been set up yet. Note that this means
// that such messages will come even if there are no “error_log” lines.
if (!logging_started) {
- fprintf(stderr, "%s%s\n", log_level_str, formatted_msg);
+ fprintf(stderr, "[%s] %s%s\n", timestamp, log_level_str, formatted_msg);
return;
}
if (log_destinations[i] == SYSLOG_FAKE_FILE) {
syslog(syslog_level, "%s", formatted_msg);
} else {
- int err = fprintf(log_destinations[i], "%s%s\n", log_level_str, formatted_msg);
+ int err = fprintf(log_destinations[i], "[%s] %s%s\n", timestamp, log_level_str, formatted_msg);
if (err < 0) {
perror("fprintf");
}