summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--tests/DevNull.cfgtest1
-rw-r--r--tests/NoExistFile.cfgtest1
-rwxr-xr-xtests/cfg.sh4
-rw-r--r--tools/omfile.c3
-rw-r--r--tools/omfwd.c2
6 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 2db856cd..de328f83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -689,8 +689,10 @@ AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes)
# settings for omstdout
+# note that "make check" fails, if omstdout is not enabled (thus we enable
+# it by default).
AC_ARG_ENABLE(omstdout,
- [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=no@:>@])],
+ [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_omstdout="yes" ;;
no) enable_omstdout="no" ;;
diff --git a/tests/DevNull.cfgtest b/tests/DevNull.cfgtest
index d30d936b..7822b6df 100644
--- a/tests/DevNull.cfgtest
+++ b/tests/DevNull.cfgtest
@@ -1,3 +1,2 @@
rsyslogd: CONFIG ERROR: there are no active actions configured. Inputs will run, but no output whatsoever is created. [try http://www.rsyslog.com/e/2103 ]
rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/NoExistFile.cfgtest b/tests/NoExistFile.cfgtest
index 4cbcc029..88d3123f 100644
--- a/tests/NoExistFile.cfgtest
+++ b/tests/NoExistFile.cfgtest
@@ -1,3 +1,2 @@
rsyslogd: CONFIG ERROR: could not interpret master config file '/This/does/not/exist'. [try http://www.rsyslog.com/e/2013 ]
rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/cfg.sh b/tests/cfg.sh
index 8acbf342..cb838354 100755
--- a/tests/cfg.sh
+++ b/tests/cfg.sh
@@ -36,7 +36,7 @@ echo "local directory"
#
# check empty config file
#
-../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail |head -2 > tmp
cmp tmp $srcdir/DevNull.cfgtest
if [ ! $? -eq 0 ]; then
echo "DevNull.cfgtest failed"
@@ -51,7 +51,7 @@ fi;
#
# check missing config file
#
-../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail |head -2 > tmp
cmp tmp $srcdir/NoExistFile.cfgtest
if [ ! $? -eq 0 ]; then
echo "NoExistFile.cfgtest failed"
diff --git a/tools/omfile.c b/tools/omfile.c
index 65306846..5141b4da 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -725,7 +725,6 @@ CODESTARTparseSelectorAct
} else {
pData->bSyncFile = bEnableSync ? 1 : 0;
}
-
pData->f_sizeLimit = 0; /* default value, use outchannels to configure! */
switch (*p)
@@ -822,7 +821,7 @@ CODESTARTparseSelectorAct
if(pData->fd < 0 ) {
pData->fd = -1;
DBGPRINTF("Error opening log file: %s\n", pData->f_fname);
- errmsg.LogError(0, NO_ERRCODE, "%s", pData->f_fname);
+ errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could no open output file '%s'", pData->f_fname);
break;
}
if(strcmp((char*) p, _PATH_CONSOLE) == 0)
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 7a945ce0..88a382e0 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -177,7 +177,7 @@ ENDfreeInstance
BEGINdbgPrintInstInfo
CODESTARTdbgPrintInstInfo
- printf("%s", pData->f_hname);
+ dbgprintf("%s", pData->f_hname);
ENDdbgPrintInstInfo