summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-22/+69
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-19/+68
| |\
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-4/+59
| | |\
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-1/+40
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-0/+1
| | |\ \
| * | \ \ Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-3/+19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-011-3/+19
| | | |/ | | |/|
| | * | bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-121-0/+1
* | | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-22/+5
* | | | milestone: regex is compiled from script based filterRainer Gerhards2012-06-121-0/+2
* | | | Merge branch 'beta'Rainer Gerhards2012-06-061-0/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-061-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-061-0/+5
| | |\ \ | | | |/
| | | * add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-041-0/+5
* | | | Merge branch 'beta'Rainer Gerhards2012-06-011-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-2/+2
| | |\ \ | | | |/
| | | * cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
* | | | added --enable-debugless configure option for very high demanding environmentsRainer Gerhards2012-05-291-1/+0
|/ / /
* | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-291-0/+3
|\ \ \ | |/ /
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-291-0/+3
| |\ \ | | |/
| | * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-291-0/+3
| | * cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-1/+1
| * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-0/+1
| |\ \ | | |/
| | * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
* | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-121-72/+97
|\ \ \ | |/ /
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-121-73/+97
| |\ \
| | * \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-121-73/+97
| | |\ \ | | | |/
| | | * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-1/+1
| | | * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-72/+93
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-071-8/+2
| |\ \ \ | | |/ /
| * | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-121-2/+9
| |\ \ \
* | \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-8/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-9/+2
| | |/ / | |/| |
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-0/+1
| * | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-221-3/+5
| * | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-2/+6
| | |/ | |/|
* | | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-191-2/+2
* | | Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-1/+7
|\ \ \ | | |/ | |/|
| * | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-0/+3
| |\ \
| | * | add elasticsearch output moduleNathan Scott2012-01-171-0/+3
| | |/
| * | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
| * | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-161-1/+21
| |\ \ | | |/
| * | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-0/+3
| |\ \
| | * \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+9
| | |\ \
| | | * | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+9
| | * | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+3
| | |\ \ \ | | | |/ /