diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-08 16:42:44 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-08 16:42:44 +0200 |
commit | ed2cd2806e0cf00990c73f184698bf683ee10cc2 (patch) | |
tree | 2a8077a3e609e76d89bf0e9cd23b19c03d50fd69 /tools | |
parent | c897ac6e6de3b430911cad71e7453d8b4b3c57bc (diff) | |
parent | 17e24eae733a0bce0eda65947e7559a05c91fc9c (diff) | |
download | rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.tar.gz rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.tar.xz rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.zip |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tools/omfile.c
Diffstat (limited to 'tools')
-rw-r--r-- | tools/omfile.c | 7 | ||||
-rw-r--r-- | tools/syslogd.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index eaffa70e..65140ac4 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -66,6 +66,7 @@ #include "errmsg.h" #include "stream.h" #include "unicode-helper.h" +#include "atomic.h" MODULE_TYPE_OUTPUT @@ -103,7 +104,7 @@ static int bCreateDirs; /* auto-create directories for dynaFiles: 0 - no, 1 - ye static int bEnableSync = 0;/* enable syncing of files (no dash in front of pathname in conf): 0 - no, 1 - yes */ static int iZipLevel = 0; /* zip compression mode (0..9 as usual) */ static bool bFlushOnTXEnd = 1;/* flush write buffers when transaction has ended? */ -static int iIOBufSize = IOBUF_DFLT_SIZE; /* size of an io buffer */ +static int64 iIOBufSize = IOBUF_DFLT_SIZE; /* size of an io buffer */ static int iFlushInterval = FLUSH_INTRVL_DFLT; /* how often flush the output buffer on inactivity? */ static uchar *pszTplName = NULL; /* name of the default template to use */ /* end globals for default values */ @@ -156,6 +157,7 @@ CODESTARTdbgPrintInstInfo "\tfile owner %d, group %d\n" "\tdirectory owner %d, group %d\n" "\tforce chown() for all files: %s\n" + "\tdir create mode 0%3.3o, file create mode 0%3.3o\n" "\tfail if owner/group can not be set: %s\n", pData->f_fname, pData->iDynaFileCacheSize, @@ -163,6 +165,7 @@ CODESTARTdbgPrintInstInfo pData->fileUID, pData->fileGID, pData->dirUID, pData->dirGID, pData->bForceChown ? "yes" : "no", + pData->fDirCreateMode, pData->fCreateMode, pData->bFailOnChown ? "yes" : "no" ); } else { /* regular file */ @@ -705,7 +708,7 @@ CODESTARTparseSelectorAct pData->dirGID = dirGID; pData->iZipLevel = iZipLevel; pData->bFlushOnTXEnd = bFlushOnTXEnd; - pData->iIOBufSize = iIOBufSize; + pData->iIOBufSize = (int) iIOBufSize; pData->iFlushInterval = iFlushInterval; if(pData->bDynamicName == 0) { diff --git a/tools/syslogd.c b/tools/syslogd.c index 66d102b4..d99fb84d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1787,7 +1787,7 @@ static void doexit() /* set the maximum message size */ -static rsRetVal setMaxMsgSize(void __attribute__((unused)) *pVal, int iNewVal) +static rsRetVal setMaxMsgSize(void __attribute__((unused)) *pVal, long iNewVal) { return glbl.SetMaxLine(iNewVal); } |