diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
| commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
| tree | d534a1941848a4f9577076cd11330f3ee014033c /tools | |
| parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
| parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
| download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfile.c | 2 | ||||
| -rw-r--r-- | tools/rsyslogd.8 | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 06875fe4..8144386f 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -296,6 +296,8 @@ int resolveFileSizeLimit(instanceData *pData) execProg(pCmd, 1, pParams); + free(pCmd); + pData->fd = open((char*) pData->f_fname, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY, pData->fCreateMode); diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 05905412..86c4bf66 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -254,6 +254,14 @@ configuration file (default is will be reread and the .BR rsyslog (3) facility is started again. +Note that this means a full rsyslogd restart is done. This has, among others, +the consequence that TCP and other connections are torn down. Also, if any +queues are not running in disk assisted mode or are not set to persist data +on shutdown, queue data is lost. HUPing rsyslogd is an extremely expensive +operation and should only be done when actually necessary. Actually, it is +a rsyslgod stop immediately followed by a restart. Future versions will probably +include a special handling which only closes files, but will not cause any +of the other effects. .TP .B TERM ", " INT ", " QUIT .B Rsyslogd |