diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:06:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:06:00 +0200 |
| commit | b37a1eb0f8422102c11c597f15139d64c2d51c13 (patch) | |
| tree | f581869c5996b7e203e41a38a11cce2724fca7a9 | |
| parent | f0467569d26ad7eafddb324690a55001143f9d91 (diff) | |
| download | rsyslog-b37a1eb0f8422102c11c597f15139d64c2d51c13.tar.gz rsyslog-b37a1eb0f8422102c11c597f15139d64c2d51c13.tar.xz rsyslog-b37a1eb0f8422102c11c597f15139d64c2d51c13.zip | |
omfile itself no longer needs zlib
| -rwxr-xr-x | tests/diskqueue.sh | 1 | ||||
| -rw-r--r-- | tools/omfile.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh index d2e75cbd..8233d569 100755 --- a/tests/diskqueue.sh +++ b/tests/diskqueue.sh @@ -9,6 +9,7 @@ echo diskqueue.sh: testing queue disk-only mode source $srcdir/diag.sh init source $srcdir/diag.sh startup diskqueue.conf # 20000 messages should be enough - the disk test is slow enough ;) +sleep 4 source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 20000 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages source $srcdir/diag.sh wait-shutdown diff --git a/tools/omfile.c b/tools/omfile.c index b62d9c57..82944a96 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -65,7 +65,6 @@ #include "module-template.h" #include "errmsg.h" #include "stream.h" -#include "zlibw.h" #include "unicode-helper.h" MODULE_TYPE_OUTPUT @@ -74,7 +73,6 @@ MODULE_TYPE_OUTPUT */ DEF_OMOD_STATIC_DATA DEFobjCurrIf(errmsg) -DEFobjCurrIf(zlibw) DEFobjCurrIf(strm) /* The following structure is a dynafile name cache entry. @@ -745,7 +743,6 @@ BEGINmodExit CODESTARTmodExit objRelease(errmsg, CORE_COMPONENT); objRelease(strm, CORE_COMPONENT); - objRelease(zlibw, LM_ZLIBW_FILENAME); free(pszTplName); ENDmodExit @@ -762,7 +759,6 @@ CODESTARTmodInit *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(errmsg, CORE_COMPONENT)); - CHKiRet(objUse(zlibw, LM_ZLIBW_FILENAME)); CHKiRet(objUse(strm, CORE_COMPONENT)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"dynafilecachesize", 0, eCmdHdlrInt, (void*) setDynaFileCacheSize, NULL, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileziplevel", 0, eCmdHdlrInt, NULL, &iZipLevel, STD_LOADABLE_MODULE_ID)); |