Changeset 9a2a703 in code

Timestamp:

Mar 5, 2014, 11:36:39 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

21477e9, 6e89d69

Parents:

c1888a5

git-author:

Mike Belopuhov <mike@…> (03/05/14 23:35:37)

git-committer:

Mike Belopuhov <mike@…> (03/05/14 23:36:39)

Message:

Stuff logger_setts into the logger_tick directly

File:

• logger.c (modified) (8 diffs)

logger.c

@@ -39 +39 @@
 void logger_dispatch(int, short, void *);
 FILE *logger_open(char *);
-void logger_tick(int, short, void *);
-void logger_setts(void);
+void logger_tick(void);
 
 struct icbd_logentry {
@@ -57 +56 @@
 
 char file_ts[sizeof "0000-00"];
-char line_ts[sizeof "[00:00] "];
+char line_ts[sizeof "00:00"];
 struct event ev_tick;
 
@@ -68 +67 @@
         static struct event ev;
         struct passwd *pw;
-        struct timeval tv = { 60, 0 };
         int pipes[2];
 
@@ -125 +123 @@
         }
 
-        /* event for the tick */
-        evtimer_set(&ev_tick, logger_tick, NULL);
-        if (evtimer_add(&ev_tick, &tv) < 0) {
-                syslog(LOG_ERR, "evtimer_add: %m");
-                exit (EX_UNAVAILABLE);
-        }
-        logger_setts();
+        evtimer_set(&ev_tick, (void (*)(int, short, void *))logger_tick, NULL);
+        logger_tick();
         return event_dispatch();
 }
@@ -171 +164 @@
                 return;
         if (strlen(e.nick) == 0)
-                fprintf(fp, "%s%s\n", line_ts, buf);
+                fprintf(fp, "[%s] %s\n", line_ts, buf);
         else
-                fprintf(fp, "%s<%s> %s\n", line_ts, e.nick, buf);
+                fprintf(fp, "[%s] <%s> %s\n", line_ts, e.nick, buf);
 }
 
@@ -224 +217 @@
 
 void
-logger_tick(int fd __attribute__((unused)), short event __attribute__((unused)),
-    void *arg __attribute__((unused)))
+logger_tick(void)
 {
         struct timeval tv = { 60, 0 };
-
-        logger_setts();
-        if (evtimer_add(&ev_tick, &tv) < 0) {
-                syslog(LOG_ERR, "evtimer_add: %m");
-                exit (EX_UNAVAILABLE);
-        }
-}
-
-void
-logger_setts(void)
-{
         static int last_mon = -1;
         struct tm *tm;
@@ -250 +231 @@
                     1900, tm->tm_mon + 1);
                 last_mon = tm->tm_mon;
+                /* rotate log files */
                 for (i = 0; i < nlogfiles; i++) {
                         fclose(logfiles[i].fp);
@@ -256 +238 @@
                 nlogfiles = 0;
         }
-        snprintf(line_ts, sizeof line_ts, "[%02d:%02d] ", tm->tm_hour,
+        snprintf(line_ts, sizeof line_ts, "%02d:%02d", tm->tm_hour,
             tm->tm_min);
-}
+        if (evtimer_add(&ev_tick, &tv) < 0) {
+                syslog(LOG_ERR, "evtimer_add: %m");
+                exit (EX_UNAVAILABLE);
+        }
+}