summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2009-10-054-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-devel' into tmpRainer Gerhards2009-10-0213-85/+238
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tcpsrv.c
| | * | | | | | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-0215-110/+309
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'beta'Rainer Gerhards2009-09-293-29/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | | | | | | | | updated project statusRainer Gerhards2009-09-291-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | updated project statusRainer Gerhards2009-09-171-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | added $AbortOnUncleanConfig directiveRainer Gerhards2009-09-174-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permits to prevent startup when there are problems with the configuration file. See it's doc for details.
| * | | | | | | | | | | | | | updated project statusRainer Gerhards2009-09-141-4/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | bumped version numberRainer Gerhards2009-09-143-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | preparing for 5.3.0v5.3.0Rainer Gerhards2009-09-141-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'v4-devel' into masterRainer Gerhards2009-09-144-5/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | | | | | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-09-144-5/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'imudp-epoll'Rainer Gerhards2009-09-143-21/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | removed some debugging commentsRainer Gerhards2009-09-141-4/+0
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into imudp-epollRainer Gerhards2009-09-103-20/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | changed imudp to utilize epoll(), where available.Rainer Gerhards2009-09-093-21/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shall provide slightly better performance (just slightly because we called select() rather infrequently on a busy system).
| * | | | | | | | | | | | | | | | | changelog: made new directive clearRainer Gerhards2009-09-111-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'v4-devel'Rainer Gerhards2009-09-114-2/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | added new config directive $omfileForceChown to fix some broken system configs.Rainer Gerhards2009-09-114-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See ticket for details: http://bugzilla.adiscon.com/show_bug.cgi?id=150
| | * | | | | | | | | | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-09-103-20/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | added new config option $InputUnixListenSocketCreatePathRainer Gerhards2009-09-043-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport from v5-devel
| * | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2009-09-102-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tmp'Rainer Gerhards2009-09-101-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use automake 1.11 silent-rules supportMichael Biebl2009-09-045-316/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop shave and use automake 1.11 silent-rules http://www.flameeyes.eu/autotools-mythbuster/automake/silent.html
| * | | | | | | | | | | | | | | | | | added new config option $InputUnixListenSocketCreatePathRainer Gerhards2009-09-043-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to permit the auto-creation of pathes to additional log sockets. This turns out to be useful if they reside on temporary file systems and rsyslogd starts up before the daemons that create these sockets (rsyslogd always creates the socket itself if it does not exist).
| * | | | | | | | | | | | | | | | | | doc: clarified availability of $LogRSyslogStatusMessages directiveRainer Gerhards2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into javaRainer Gerhards2009-09-048-26/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v4-devel'Rainer Gerhards2009-09-045-19/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | | | | | | | | | | | | | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-09-042-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | added $LogRSyslogStatusMessages configuration directiveRainer Gerhards2009-09-045-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...permitting to turn off rsyslog start/stop/HUP messages. See Debian ticket http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=463793
| | * | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2009-09-034-3/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | updated project statusRainer Gerhards2009-09-021-4/+4
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | improved syslog traffic generator GUI a (little) bitRainer Gerhards2009-09-021-13/+29
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | now supports sending UDP messages via multiple threadsRainer Gerhards2009-08-313-10/+99
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | added a very rough first sketch of a traffic generator guiRainer Gerhards2009-08-284-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... not really usable yet, but a good milestone
| * | | | | | | | | | | | | | | | | | | | | added --enable-gui configure switchRainer Gerhards2009-08-273-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which now permits to enable/disable GUI components. This also checks if Java is present and, if not, complains during ./configure.
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into javaRainer Gerhards2009-08-2711-23/+78
| |\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | added a (very, very basic) build system for the Java GUIRainer Gerhards2009-08-273-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so far, this can not be turned off (will do when I have merged the recent build system changes into this branch - I am glad that I at least have a working reference point now ;)).
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into javaRainer Gerhards2009-08-2125-99/+279
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | added forgotten fileRainer Gerhards2009-07-281-0/+138
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | some real code to dig into the rsyslog processing...Rainer Gerhards2009-07-287-3/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unfortunately, imdiag currently does not offer many counters (to phrase it politely). Will need to implement a counter interface as one of the very next steps...
| * | | | | | | | | | | | | | | | | | | | | | first shot at mini-receiver and mini-parser java classes (for gui)Rainer Gerhards2009-07-246-3/+277
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | simple test for integration with autotoolsRainer Gerhards2009-07-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (far less trivial than I had hoped...)
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'v4-beta' into betaRainer Gerhards2009-10-212-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-10-212-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imrelp/imrelp.c
| | * | | | | | | | | | | | | | | | | | | | | bumped version numberRainer Gerhards2009-10-203-4/+6
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | added imported bugfix to changelogRainer Gerhards2009-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-202-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | bugfix: potential hang condition on queue shutdownRainer Gerhards2009-10-202-2/+1
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-143-5/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c