Changeset a5893e9 in code

Timestamp:

Mar 5, 2014, 4:56:11 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

4e66b3a

Parents:

45bd56a

git-author:

Florian Obser <florian@…> (03/05/14 16:30:11)

git-committer:

Mike Belopuhov <mike@…> (03/05/14 16:56:11)

Message:

time accounting for log lines

File:

• logger.c (modified) (7 diffs)

logger.c

@@ -19 +19 @@
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/uio.h>
 #include <errno.h>
@@ -27 +28 @@
 #include <syslog.h>
 #include <sysexits.h>
+#include <time.h>
 #include <login_cap.h>
 #include <event.h>
@@ -35 +37 @@
 
 void logger_dispatch(int, short, void *);
+void logger_tick(int, short, void *);
+void logger_set_ts(void);
 
 int logger_pipe;
@@ -43 +47 @@
         size_t  length;
 };
+
+char line_ts[sizeof("[12:34 ]")];
+
+struct event ev_tick;
+struct timeval tick;
 
 int
@@ -100 +109 @@
         }
 
+        /* event for the tick */
+        tick.tv_sec = 60;
+        tick.tv_usec = 0;
+        evtimer_set(&ev_tick, logger_tick, NULL);
+        if (evtimer_add(&ev_tick, &tick) < 0) {
+                syslog(LOG_ERR, "evtimer_add: %m");
+                exit (EX_UNAVAILABLE);
+        }
+        logger_set_ts();
         return event_dispatch();
 }
@@ -133 +151 @@
         /* TODO: check time of the day and open the next file */
 
-        fprintf(stderr, "%s@%s: %s\n", e.nick, e.group, buf);
+        fprintf(stderr, "%s%s@%s: %s\n", line_ts, e.nick, e.group, buf);
 }
 
@@ -155 +173 @@
                 syslog(LOG_ERR, "logger write: %m");
 }
+
+void
+logger_tick(int fd __attribute__((unused)), short event __attribute__((unused)),
+    void *arg __attribute__((unused)))
+{
+        logger_set_ts();
+        if (evtimer_add(&ev_tick, &tick) < 0) {
+                syslog(LOG_ERR, "evtimer_add: %m");
+                exit (EX_UNAVAILABLE);
+        }
+}
+void
+logger_set_ts(void)
+{
+        struct tm *tm;
+        time_t t;
+
+        t = time(NULL);
+        tm = gmtime(&t);
+        snprintf(line_ts, sizeof(line_ts), "[%02d:%02d] ", tm->tm_hour,
+            tm->tm_min);
+}