summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable'Rainer Gerhards2010-04-265-12/+49
|\
| * cosmetic: removed left-over debug messageRainer Gerhards2010-04-261-1/+0
| |
| * added new test to testbenchRainer Gerhards2010-04-261-0/+3
| | | | | | | | ... had forgotten this step...
| * bugfix(kind of): output plugin retry behaviour could cause engine to loopRainer Gerhards2010-04-264-12/+47
| | | | | | | | | | | | | | | | | | The rsyslog engine did not guard itself against output modules that do not properly convey back the tryResume() behaviour. This then leads to what looks like an endless loop. I consider this to be a bug of the engine not only because it should be hardened against plugin misbehaviour, but also because plugins may not be totally able to avoid this situation (depending on the type of and processing done by the plugin).
* | Merge branch 'v5-stable'Rainer Gerhards2010-04-263-3/+34
|\| | | | | | | | | Conflicts: tests/diag.sh
| * added testcase for problem with pipe without a readerRainer Gerhards2010-04-263-0/+34
| | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=186 Note that this adds the test case, but does not yet provide a solution (so make check will hang when executed). Fix will be done next.
* | Merge branch 'v4-devel' into tmpRainer Gerhards2010-04-263-1/+26
|\ \
| * | added new $Sleep directive to hold processing for a couple of seconds during ↵Rainer Gerhards2010-04-263-1/+26
| | | | | | | | | | | | startup
* | | Merge branch 'v5-stable' into masterRainer Gerhards2010-04-262-30/+43
|\ \ \ | | |/ | |/| | | | | | | Conflicts: ChangeLog
| * | bugfix(minor): status variable was uninitializedRainer Gerhards2010-04-262-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | However, this would have caused harm only if NO parser modules at all were loaded, which would lead to a defunctional configuration at all. And, even more important, this is impossible as two parser modules are built-in and thus can not be "not loaded", so we always have a minimum of two.
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-04-014-16/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/syslogd.c
* | \ \ Merge branch 'v4-devel' into masterRainer Gerhards2010-04-233-4/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | cosmetic: prepared ChangeLog for next releaseRainer Gerhards2010-04-231-0/+2
| | | |
| * | | minor fix: invalid duplicated include of config.hRainer Gerhards2010-04-231-2/+0
| | | |
| * | | preparing for 4.7.1 releasev4.7.1Rainer Gerhards2010-04-223-3/+3
| | | |
| * | | fixed typo ... that caused compilation to fail on non-SolarisRainer Gerhards2010-04-221-1/+1
| | | |
* | | | Merge branch 'master' of git+ssh://rger@git.adiscon.com/git/rsyslogRainer Gerhards2010-04-231-4/+4
|\ \ \ \
| * | | | updating project statusRainer Gerhards2010-04-221-4/+4
| | | | |
* | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-236-27/+37
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | Conflicts: runtime/rsyslog.h runtime/wtp.c
| * | | solved alignment errors on Solaris SparcRainer Gerhards2010-04-226-29/+34
| | | |
| * | | removed some complier warningsRainer Gerhards2010-04-212-4/+16
| | | |
* | | | cleanup of some compiler warningsRainer Gerhards2010-04-212-5/+17
| | | |
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-04-213-0/+7
|\| | |
| * | | bugfix: some race condition in testbench on Solaris/SparcSuper-User2010-04-213-0/+7
| | | |
* | | | adopted imsolaris to the new v5 semanticsRainer Gerhards2010-04-211-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | It now supports the new cancel-free termination mode. This is important to get a really reliable solution in all cases. This concludes the initial implementation of imsolaris for v5.
* | | | fixed broken mergeRainer Gerhards2010-04-201-1/+0
| | | |
* | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-2010-118/+343
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imsolaris/imsolaris.c tests/Makefile.am
| * | | doc for imsolaris addedRainer Gerhards2010-04-203-0/+49
| | | |
| * | | saved old copy of Java DiagTalker toolRainer Gerhards2010-04-202-0/+3
| | | |
| * | | testbench improvement: Java is no longer needed for testing tool creationRainer Gerhards2010-04-204-8/+165
| | | |
| * | | finalized work on imsolarisRainer Gerhards2010-04-201-110/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did a couple of clean-ups and made the module more robust. Among others, improved performance and structure, fixed the recovery handler (which did not correctly work before) and straightend out some minor issues. Doc and some platform tests are still missing, but other than that this version looks pretty good.
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-04-196-132/+166
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.h runtime/rsyslog.h runtime/stream.c
| * | | improved quality of imsolaris codeRainer Gerhards2010-04-196-132/+166
| | | | | | | | | | | | | | | | including refctoring for a more simple solution
| * | | changed flag value for v5-compatibilityRainer Gerhards2010-04-191-1/+1
| | | |
* | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-194-29/+24
|\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.h
| * | | changed imsolaris to use submitMsg() APIRainer Gerhards2010-04-193-28/+22
| | | | | | | | | | | | | | | | | | | | This includes a modification to the rsyslog engine so that messages without PRI inside the message can properly be handled.
| * | | minor cleanupRainer Gerhards2010-04-193-3/+3
| | | |
* | | | some cleanupRainer Gerhards2010-04-195-5/+25
| | | |
* | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-04-1925-1122/+929
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html runtime/debug.c runtime/rsyslog.h tests/Makefile.am tests/diag.sh tests/nettester.c tools/syslogd.c
| * | | some more cleanupRainer Gerhards2010-04-193-29/+11
| | | |
| * | | some platforms seem to need time.h inside msleep.cPeter Bray2010-04-191-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | minor cleanup (cosmetic)Rainer Gerhards2010-04-152-70/+52
| | | |
| * | | first version of imsolaris created, cleanup for solaris doneRainer Gerhards2010-04-1511-620/+420
| | | | | | | | | | | | | | | | more cleanup required, but things now basically work
| * | | preparing for 4.7.0v4.7.0Rainer Gerhards2010-04-141-1/+1
| | | |
| * | | Merge branch 'v4-devel' of git+ssh://git.adiscon.com/git/rsyslog into v4-develRainer Gerhards2010-04-143-49/+23
| |\ \ \
| | * | | some cleanup of solaris imklogRainer Gerhards2010-04-123-49/+23
| | | | |
| * | | | slightly improved/cleaned up debugging systemRainer Gerhards2010-04-141-3/+16
| |/ / /
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-04-129-12/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | solving a number of minor (but annoying) issues in the build systemRainer Gerhards2010-04-126-9/+10
| | | | |
| | * | | added new configure option that permits to disable and enable an extended ↵Rainer Gerhards2010-04-124-2/+27
| | | | | | | | | | | | | | | | | | | | testbench
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 18:47:40 +0000