From 916449ce6e04c3238b65679ab6d92dfc8f5a211c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sun, 22 Jul 2007 10:18:45 +0000 Subject: changed interface, now is updated by rule engine --- ommysql.c | 1 - omshell.c | 1 - omusrmsg.c | 1 - syslogd.c | 5 ++++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ommysql.c b/ommysql.c index eda2490a..a91f2209 100644 --- a/ommysql.c +++ b/ommysql.c @@ -263,7 +263,6 @@ int doActionMySQL(selector_t *f, time_t now) { assert(f != NULL); - f->f_time = now; dprintf("\n"); writeMySQL(f); return 0; diff --git a/omshell.c b/omshell.c index 8154f930..5f64e50d 100644 --- a/omshell.c +++ b/omshell.c @@ -52,7 +52,6 @@ int doActionShell(selector_t *f, time_t now) * modularization. We'll change that as we go ahead with modularization. * rgerhards, 2007-07-20 */ - f->f_time = now; /* TODO: find out, if we can not simply replace this with time(NULL) */ dprintf("\n"); iovCreate(f); psz = (uchar*) iovAsString(f); diff --git a/omusrmsg.c b/omusrmsg.c index 123cd938..1590c689 100644 --- a/omusrmsg.c +++ b/omusrmsg.c @@ -207,7 +207,6 @@ int doActionUsrMsg(selector_t *f, time_t now) { assert(f != NULL); - f->f_time = now; dprintf("\n"); wallmsg(f); return 0; diff --git a/syslogd.c b/syslogd.c index 929a3df5..aaacd983 100644 --- a/syslogd.c +++ b/syslogd.c @@ -4370,7 +4370,7 @@ void fprintlog(register selector_t *f) case F_TTY: case F_FILE: case F_PIPE: - dprintf(" (%s)\n", f->f_un.f_file.f_fname); + printf(" (%s)\n", f->f_un.f_file.f_fname); f->f_time = now; /* we need this for message repeation processing */ /* f->f_file == -1 is an indicator that the we couldn't * open the file at startup. For dynaFiles, this is ok, @@ -4382,16 +4382,19 @@ void fprintlog(register selector_t *f) case F_USERS: case F_WALL: + f->f_time = now; doActionUsrMsg(f, now); break; #ifdef WITH_DB case F_MYSQL: + f->f_time = now; doActionMySQL(f, now); break; #endif case F_SHELL: /* shell support by bkalkbrenner 2005-09-20 */ + f->f_time = now; doActionShell(f, now); break; -- cgit v1.2.3