summaryrefslogtreecommitdiffstats
path: root/runtime/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-251-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
| * bugfix: replacements for atomic operations for non-int sized types had problems.Rainer Gerhards2010-11-251-0/+1
| | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile).
* | omhdfs: support for HUP addedRainer Gerhards2010-10-041-2/+4
| |
* | build system: fixed some minor issuesRainer Gerhards2010-09-281-0/+2
| |
* | added some generic hashtable code by Christopher ClarkRainer Gerhards2010-09-281-0/+2
| | | | | | | | found at http://www.cl.cam.ac.uk/~cwc22/hashtable/
* | improved statistics-gathering subsystemRainer Gerhards2010-09-131-2/+4
| | | | | | | | | | | | | | | | ... well, actually this is a first real implementation of this subsystem. I have added a counter registry, a way to access the countres (as readable string) and a way to define and maintem them. Also, module impstats has been updated to utilize the new system. Finally, I added some counters. I hope that this sets the baseline for useful future enhancements.
* | moved systemd interface to rsyslog convenience libRainer Gerhards2010-09-081-2/+2
| | | | | | | | | | | | | | Mostly a refresh of sd-daemon.[ch] from its source plus some make file changes. We now have systemd interfaces inside rsyslog, so that all plugins interested can call the interfaces. Seems not to be totally necessary right now, but will help in the long term.
* | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-071-0/+5
|/
* first implementation of strgen interfaceRainer Gerhards2010-06-011-0/+2
| | | | | and a first built-in strgen module. Some tweaks and more default strgens are needed, but the code doesn't look too bad ;)
* Merge branch 'v4-devel' into masterRainer Gerhards2010-04-271-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/atomic.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h runtime/wtp.c runtime/wtp.h
| * bugfix: problems with atomic operations emulationRainer Gerhards2010-04-271-1/+0
| | | | | | | | | | | | replaced atomic operation emulation with new code. The previous code seemed to have some issue and also limited concurrency severely. The whole atomic operation emulation has been rewritten.
| * Merge branch 'v4-stable-solaris' into v4-develRainer Gerhards2010-04-121-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c tools/syslogd.c
* | \ Merge branch 'beta' into masterRainer Gerhards2010-04-091-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
| * \ \ Merge branch 'v4-stable-solaris' into betaRainer Gerhards2010-04-091-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
| | * | added replacements for atomic instructions on systems that do not support them.Rainer Gerhards2010-03-231-0/+1
| | | | | | | | | | | | | | | | [backport of Stefen Sledz' patch for v5]
* | | | emulate missing atomic builtins with posix semaphores if availableSteffen Sledz2010-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Steffen Sledz <sledz@dresearch.de> Acked-by: Thilo Fromm <t.fromm@dresearch.de>
* | | | added skeleton for supporting epoll() API in netstream subsystemRainer Gerhards2009-11-181-2/+7
| | | |
* | | | Merge branch 'v4-devel'Rainer Gerhards2009-11-171-0/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_modules.html gss-misc.c plugins/imgssapi/imgssapi.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c
| * | integrating varmojfekoj's "unlimited select()" patch into v4-develRainer Gerhards2009-11-171-0/+1
| |\ \ | | |/ | |/|
| | * added option to use unlimited-size select() callsvarmojfekoj2009-11-171-0/+1
| | | | | | | | | | | | | | | | | | Thanks to varmjofekoj for the patch Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-221-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * | added basic plumbing to support message properties separate from messageRainer Gerhards2009-06-161-0/+2
| | | | | | | | | | | | | | | will fill this with live somewhat later, noticed I need to do some stage work first (at least this is useful).
* | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-161-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
| * | omfile buffers are now synchronized after inactivityRainer Gerhards2009-06-151-0/+2
| | | | | | | | | | | | | | | | | | This is the first shot at this functionality. Currently, we run off a fixed counter in the rsyslogd mainloop, which needs to be restructured. But this code works, so it is a good time for a commit.
| * | restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | ... this was long overdue, and I finlly tackeld it. It turned out to be more complex than I initially thought. The next step now probably is to actually implement multiple rule sets and the beauty that comes with them.
| * | first proof of concept on zipped file writerRainer Gerhards2009-06-031-0/+11
| |/ | | | | | | | | | | This DOES NOT work sufficiently well, I just wanted to verify that zip writing is possible and files are readable. Will be refined soon.
* | Merge branch 'master' into v5-develRainer Gerhards2009-06-041-0/+7
|\| | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * added a generic network stream serverRainer Gerhards2009-06-021-0/+7
| | | | | | | | (in addition to rather specific syslog tcp server)
* | Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-251-1/+1
|\| | | | | | | | | | | Conflicts: tests/Makefile.am tests/diskqueue.sh
| * fixing some nits with the build systemRainer Gerhards2009-05-221-1/+1
| |
* | Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-221-0/+1
|\| | | | | | | | | | | | | Conflicts: runtime/rsyslog.h tests/Makefile.am tools/syslogd.c
| * added capability to run multiple tcp listeners (on different ports)Rainer Gerhards2009-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | Well, actually this and a lot of related things. I improved the testbench so that the new capabilities are automatically tested and also did some general cleanup. The current multiple tcp listener solution will probably receive some further cleanup, too, but looks quite OK so far. I also reviewed the way tcpsrv et all work, in preparation of using this code for imdiag. I need to document the findings, especially as the code is rather complicated "thanks" to the combination of plain tcp and gssapi transport modes.
* | moving to a cleaner implementation of batchesRainer Gerhards2009-05-121-0/+1
|/ | | | ... now that we know what we need from a theoretical POV.
* Merge branch 'beta'Rainer Gerhards2009-02-241-9/+9
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html
| * make all cflags and libs variables uppercaseMichael Biebl2009-02-241-9/+9
| | | | | | | | | | | | pkg-config uses uppercase for its _CFLAGS and _LIBS variable names. So we follow suit and convert all _cflags and _libs variables to uppercase for more consistency.
* | Merge branch 'master' into nextmasterRainer Gerhards2008-10-221-0/+4
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * added capability to support multiple module search pathes.Marius Tomaschewski2008-10-201-0/+4
| | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | reordered imudp processing.Rainer Gerhards2008-10-081-0/+2
|/ | | | | | Message parsing is now done as part of main message queue worker processing (was part of the input thread) This should also improve performance, as potentially more work is done in parallel.
* begun building a testbenchRainer Gerhards2008-06-131-1/+19
|
* Fix linker flags for librsyslog and rsyslogdMichael Biebl2008-06-111-1/+1
| | | | | | | | | | Use $(dl_libs) and $(rt_libs) instead of -ldl and -lrt. This ensures that rsyslog can be successfully built on *BSD. Don't like rsyslogd against $(dl_libs) and $(rt_libs) anymore. This functionality is now in librsyslog. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* bugfix: missing linker options caused build to fail on some systems.Tiziano Mueller2008-05-211-1/+1
| | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* restructured netstrm driver layerRainer Gerhards2008-04-301-16/+2
| | | | | | | the new structure prevents repetitive loads and unloads of driver files; it also has less overhead The "select" and regular driver are now contained in a single file.
* server handshake now works with nonblocking socketsRainer Gerhards2008-04-301-1/+1
|
* removed loadbale module leakRainer Gerhards2008-04-291-14/+2
| | | | | | - moved netstrms, netstrm and nssel into a single loadble module because they belong together - fixed "loadbale module leak"
* added select() driver for GnuTlsRainer Gerhards2008-04-241-0/+7
|
* Merge branch 'sock-abstract' into tlsRainer Gerhards2008-04-241-3/+24
|\ | | | | | | | | | | | | | | | | | | Conflicts: runtime/Makefile.am runtime/netstrm.c runtime/nsd.h runtime/nsd_ptcp.c runtime/rsyslog.h
| * added new netstrms classRainer Gerhards2008-04-231-2/+8
| | | | | | | | netstrms is at the top layer of the socket abstraction
| * objects for receive-side socket abstraction specifiedRainer Gerhards2008-04-231-2/+15
| | | | | | | | | | | | | | The objects for receiver-side socket abstraction have now be specified. The project as whole does not yet compile and definitely not run, but I'd like to commit some milestones along this way.
* | first working TLS-enabled plain TCP senderRainer Gerhards2008-04-181-2/+2
| | | | | | | | | | implemented a first working version of a TLS-enabled plain TCP sender (but, of course, the implementation is insecure as it is)
* | set stage for TLS client implementationRainer Gerhards2008-04-181-3/+13
|/