[PATCH] systemd integration, take two
Hi! After a short session with Bazsi the other day, the earlier systemd integration patches were reworked slightly. Bazsi refactored the patch, I cleaned it up a little afterwards, and tested it to the best of my knowledge (also thanks to Peter Czanik for testing the new patches aswell). The patches are available on the integration/systemd branch of my repositories: git://git.balabit.hu/algernon/syslog-ng-3.3.git and git://git.balabit.hu/algernon/syslog-ng-3.2.git (for 3.3 and 3.2, respectively). The change in this patchset is that the way systemd sockets are recognised has been reworked, which made my previous GSockAddr changes unnecessary (and thus, those changes were dropped). As a side effect, unix-stream sockets should be working too, alongside of unix-dgram, and extending this to other socket types should be a lot easier than before. I'd like to call for some more testing, and if all goes well, then this version could be merged to the official tree. -- |8]
Am Freitag, 11. Februar 2011, 20:07:57 schrieb Gergely Nagy:
Hi! Hi!
After a short session with Bazsi the other day, the earlier systemd integration patches were reworked slightly. Bazsi refactored the patch, I cleaned it up a little afterwards, and tested it to the best of my knowledge (also thanks to Peter Czanik for testing the new patches aswell).
The patches are available on the integration/systemd branch of my repositories:
git://git.balabit.hu/algernon/syslog-ng-3.3.git and git://git.balabit.hu/algernon/syslog-ng-3.2.git (for 3.3 and 3.2, respectively).
The change in this patchset is that the way systemd sockets are recognised has been reworked, which made my previous GSockAddr changes unnecessary (and thus, those changes were dropped). As a side effect, unix-stream sockets should be working too, alongside of unix-dgram, and extending this to other socket types should be a lot easier than before.
I'd like to call for some more testing, and if all goes well, then this version could be merged to the official tree.
Thanks!! I've updated a branch of our Base:System/syslog-ng (openSUSE:Factory) package to use the current patch from git. AFAIS, it works fine, but I didn't tested it yet with more than 1 socket or stream sockets. The reasulting openSUSE test RPMs are available at http://download.opensuse.org/repositories/home:/mtomaschewski:/branches:/Bas... Few notes about testing: - restart syslog[-ng] service using "systemctl restart syslog.service". - look using "lsof" if systemd and syslog-ng are using same node number [column 8] and the syslog-ng PIDs [column 2] changed, that is it has been restarted and the systemd activated socket is in use. Example: # lsof | grep /dev/log systemd 1 root 25u unix 0xffff88001caf90c0 0t0 2473 /dev/log syslog-ng 8929 root 3u unix 0xffff88001caf90c0 0t0 2473 /dev/log syslog-ng 8930 root 3u unix 0xffff88001caf90c0 0t0 2473 /dev/log # systemctl restart syslog.service && echo OK OK # lsof | grep /dev/log systemd 1 root 25u unix 0xffff88001caf90c0 0t0 2473 /dev/log syslog-ng 8962 root 3u unix 0xffff88001caf90c0 0t0 2473 /dev/log syslog-ng 8963 root 3u unix 0xffff88001caf90c0 0t0 2473 /dev/log Gruesse / Regards, Marius Tomaschewski <mt@suse.de> <mt@novell.com> -- Server Technologies Team, SUSE LINUX Products GmbH, Nuernberg; GF: Markus Rex; HRB 16746 (AG Nuernberg) GPG/PGP public key fingerprint: DF17 271A AD15 006A 5BB9 6C96 CA2F F3F7 373A 1CC0
participants (2)
-
Gergely Nagy
-
Marius Tomaschewski