summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-25 11:31:50 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-25 11:31:50 +0000
commiteaa2ca5ea5f0cb4289baa63eb42c4b0e7bb6bf4a (patch)
tree41938e655fd1108c581037682480219d9b1856f5
parent36f1b6d7f97c0dd6e96c05876ee7ddeaa5a0a3d5 (diff)
downloadrsyslog-eaa2ca5ea5f0cb4289baa63eb42c4b0e7bb6bf4a.tar.gz
rsyslog-eaa2ca5ea5f0cb4289baa63eb42c4b0e7bb6bf4a.tar.xz
rsyslog-eaa2ca5ea5f0cb4289baa63eb42c4b0e7bb6bf4a.zip
use new dbgPrintInstInfo() interface
-rw-r--r--syslogd.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/syslogd.c b/syslogd.c
index d70d34cd..f99b35f9 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -4420,47 +4420,7 @@ static void init()
printf("\tAction...: ");
}
printf("%s: ", modGetStateName(f->pMod));
- switch (f->f_type) {
- case F_FILE:
- case F_PIPE:
- case F_TTY:
- case F_CONSOLE:
- if(f->f_un.f_file.bDynamicName) {
- printf("[dynamic]\n\ttemplate='%s'\n"
- "\tfile cache size=%d\n"
- "\tcreate directories: %s\n"
- "\tfile owner %d, group %d\n"
- "\tdirectory owner %d, group %d\n"
- "\tfail if owner/group can not be set: %s\n",
- f->f_un.f_file.f_fname,
- f->f_un.f_file.iDynaFileCacheSize,
- f->f_un.f_file.bCreateDirs ? "yes" : "no",
- f->f_un.f_file.fileUID, f->f_un.f_file.fileGID,
- f->f_un.f_file.dirUID, f->f_un.f_file.dirGID,
- f->f_un.f_file.bFailOnChown ? "yes" : "no"
- );
- } else { /* regular file */
- printf("%s", f->f_un.f_file.f_fname);
- if (f->f_file == -1)
- printf(" (unused)");
- }
- break;
-
- case F_SHELL:
- printf("%s", f->f_un.f_file.f_fname);
- break;
-
- case F_FORW:
- case F_FORW_SUSP:
- case F_FORW_UNKN:
- printf("%s", f->f_un.f_forw.f_hname);
- break;
-
- case F_USERS:
- for (i = 0; i < MAXUNAMES && *f->f_un.f_uname[i]; i++)
- printf("%s, ", f->f_un.f_uname[i]);
- break;
- }
+ f->pMod->dbgPrintInstInfo(f, f->pModData);
printf("\tinstance data: 0x%x\n", (unsigned) f->pModData);
if(f->f_ReduceRepeated)
printf(" [RepeatedMsgReduction]");