diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 12:41:10 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 12:41:10 +0200 |
| commit | 2f35a69a59ec08fc00b50b6e75827bc934cfeb09 (patch) | |
| tree | 5621345ae56ce3dfb37baf5a88bc0eec67eae3c6 /tools | |
| parent | 4c8546fd6fb56d5439edb5a098c8f82bc8fc36aa (diff) | |
| parent | 0d7521d59167e47dd5c085d34edf3cd06e45cfc1 (diff) | |
| download | rsyslog-2f35a69a59ec08fc00b50b6e75827bc934cfeb09.tar.gz rsyslog-2f35a69a59ec08fc00b50b6e75827bc934cfeb09.tar.xz rsyslog-2f35a69a59ec08fc00b50b6e75827bc934cfeb09.zip | |
Merge branch 'aaron' into v4-beta
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 bb12b4b6..9d6b3d1d 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 @@ -101,7 +102,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 */ @@ -152,12 +153,14 @@ CODESTARTdbgPrintInstInfo "\tcreate directories: %s\n" "\tfile owner %d, group %d\n" "\tdirectory owner %d, group %d\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, pData->bCreateDirs ? "yes" : "no", pData->fileUID, pData->fileGID, pData->dirUID, pData->dirGID, + pData->fDirCreateMode, pData->fCreateMode, pData->bFailOnChown ? "yes" : "no" ); } else { /* regular file */ @@ -684,7 +687,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 512412da..45c30baa 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1784,7 +1784,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); } |