aboutsummaryrefslogtreecommitdiff
path: root/sysklogd
Commit message (Collapse)AuthorAgeFilesLines
* Removes stray empty line from codeGravatar Maninder Singh2015-07-131-1/+0
| | | | | | | | | This patch removes stray empty line from busybox code reported by script find_stray_empty_lines Signed-off-by: Maninder Singh <maninder1.s@samsung.com> Signed-off-by: Akhilesh Kumar <akhilesh.k@samsung.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* logread: implement dumpfollow mode of operationGravatar Phil Sutter2015-03-221-5/+11
| | | | | | | | | | | | | This is basically a combination of the default (dump mode) and -f (follow mode). Specifying -F makes logread first dump the log buffer and then immediately start following it. function old new delta packed_usage 30412 30443 +31 logread_main 491 497 +6 Signed-off-by: Phil Sutter <phil.sutter@viprinet.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: make "reopen log file every second" logic work for multiple logsGravatar Joshua Judson Rosen2014-07-031-6/+7
| | | | | | | | | | | Move last_log_time from a single global to *each logFile_t* so that we can actually apply the logic to every log-file in multi-file configurations, rather than working only for the first file written in each 1-second interval and then leaving the others connected to possibly wrong files. Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: syslogd: don't *decrement* log_file->size on write failuresGravatar Joshua Judson Rosen2014-07-021-3/+8
| | | | | | | | Even if we fail to write to a log-file, and it's not growing, it's not *shrinking* either.... Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: make "-O -" log to stdoutGravatar Denys Vlasenko2014-07-021-36/+45
| | | | | | | | | | | function old new delta packed_usage 29871 29908 +37 log_locally 404 440 +36 syslogd_main 1966 1956 -10 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/1 up/down: 73/-10) Total: 63 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: Unify unlink/truncate + unlock log-rotation logicGravatar Joshua Judson Rosen2014-06-021-19/+11
| | | | | | | | | Always unlink + reopen, rather than sometimes using ftruncate(); using a single code-path reduces the opportunity for either mistakes or duplicate code. Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: remember to un-writelock log-files even when called with "-b 0"Gravatar Joshua Judson Rosen2014-06-021-0/+4
| | | | | Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: avoid spurious ftrunctate() calls for "-b 0"Gravatar Joshua Judson Rosen2014-06-021-0/+6
| | | | | | | | | Forgetting to re-set log_file->size after truncating to zero discards log-data for the next 1 second following an oversize-induced purge, when we shouldn't necessarily throw that data away. Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* Use unsigned printf/scanf conversion where more appropriateGravatar Denys Vlasenko2013-11-291-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* logread: don't call shmdt() before exit, kernel does it for us.Gravatar Denys Vlasenko2013-11-261-4/+9
| | | | | | | | | | | function old new delta logread_main 472 466 -6 interrupted 20 9 -11 error_exit 20 - -20 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 0/2 up/down: 0/-37) Total: -37 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* logread: flush output. closes 6710Gravatar Denys Vlasenko2013-11-261-0/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: use _PATH_LOG when availableGravatar Cédric Cabessa2013-08-051-4/+7
| | | | | Signed-off-by: Cédric Cabessa <ccabessa@genymobile.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* logread: intercept all fatal signals, not just SIGINTGravatar Denys Vlasenko2013-07-281-5/+4
| | | | | | | function old new delta interrupted 27 20 -7 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* sysklogd: trim help textGravatar Denys Vlasenko2013-03-151-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: do not segfault on parse error when using default config. Closes 5762Gravatar Denys Vlasenko2013-01-201-1/+3
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: convert dummy functions to statics and get rid of IF_FEATURE_* checksGravatar Peter Korsgaard2013-01-181-12/+10
| | | | | | | | | As suggested by Mike. No bloat-o-meter difference, but a bit nicer to look at. We cannot convert the call to log_to_shmem() as it checks for G.shbuf outside the function, and G.shbuf is only available when IPC support is enabled. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* whitespace fixes. no code changesGravatar Denys Vlasenko2013-01-141-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: add option to log to Linux kernel printk bufferGravatar Peter Korsgaard2013-01-062-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Why invent our own shared memory circular buffer when the kernel has a perfectly fine one already? This can be used as a smaller/simpler alternative to the syslogd IPC support (as IPC shmem/klogd/logread aren't needed), while also allowing centralised logging of everything (kernel messages, userspace bootup and syslog) when used together with ttyprintk. Notice that kernel 3.5+ is needed to store syslog facility in printk buffer, otherwise only the priority is stored. bloat-o-meter compared to IPC+klogd+logread: function old new delta get_linux_version_code - 84 +84 lbb_prepare 25 90 +65 applet_nameofs 6 - -6 static.stdout@@GLIBC_2 8 - -8 applet_names 23 9 -14 bb_msg_standard_output 16 - -16 init_sem 18 - -18 xatoull_range 19 - -19 overlapping_strcpy 21 - -21 init_data 56 32 -24 applet_main 24 - -24 main 124 99 -25 full_write2_str 26 - -26 error_exit 26 - -26 bb_basename 30 - -30 sem_up 32 - -32 interrupted 35 - -35 fflush_stdout_and_exit 38 - -38 bb_banner 46 - -46 find_applet_by_name 59 - -59 bb_signals_recursive_norestart 90 - -90 run_applet_no_and_exit 104 - -104 timestamp_and_log 651 523 -128 syslogd_main 798 581 -217 xstrtoull_range_sfx 267 - -267 run_applet_and_exit 432 - -432 klogd_main 490 - -490 logread_main 508 - -508 .rodata 1870 937 -933 bb_common_bufsiz1 8193 - -8193 ------------------------------------------------------------------------------ (add/remove: 2/26 grow/shrink: 1/6 up/down: 149/-11829) Total: -11680 bytes Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* klogd: handle multi-char log levelsGravatar Peter Korsgaard2013-01-051-5/+2
| | | | | | | | | | | | | | Since Linux 3.5 (7ff9554bb5: printk: convert byte-buffer to variable-length record buffer), klog buffer can now contain log lines with multi-char loglevel indicators (<[0-9]+>) - So use strtoul to parse it. function old new delta klogd_main 490 525 +35 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 35/0) Total: 35 bytes Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* CONFIG_PID_FILE_PATH: new configuration option for pidfile pathsGravatar Anthony G. Basile2012-12-192-1/+7
| | | | | | | | | | | | | | | We set a default path for the directory where pidfiles are create when FEATURE_PIDFILE is selected. The default has no effect on applets which must specify a pidfile path on the command line to run, and it can be overridden by applets which optionally allow the user to specify the pidfile path. We also add pidfile write/remove support for klogd, ntpd and watchdog. For syslogd, we add a missing remove_pidfile() for better cleanup on daemon exit. Signed-off-by: Anthony G. Basile <blueness@gentoo.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* syslogd: work around rename() not renaming hardlinks to themselvesGravatar Christian Engelmayer2011-10-281-0/+8
| | | | | | | | | | | | | | | | | | | | | Function log_locally() within the syslogd can potentially lock up when restarting the daemon after a power loss in case the unplanned shutdown hit the rename operation during logfile rotation. While POSIX requires the rename operation to be atomic, many file systems such as JFFS2 implement the rename operation in 2 steps by linking the new name followed by unlinking the original name. In case of a power loss during the rename the system can end up with /var/log/messages and /var/log/messages.0 being 2 hard links to the same file. When the syslog daemon restarts in such a situation it will rediscover the need to rotate the log files, however, POSIX also requires that rename does nothing and reports success in case oldpath and newpath are existing hard links to the same file. Looping through reopen: by (O_CREAT | O_APPEND), the daemon eternally reopens the same file without succeeding to rotate. Signed-off-by: Christian Engelmayer <christian.engelmayer@frequentis.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: fix missing newline problen in memory log buffer. Closes 4159Gravatar Denys Vlasenko2011-09-161-2/+2
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: remove "Options:" string from help textsGravatar Denys Vlasenko2011-06-054-4/+0
| | | | | | | function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd,klogd: better help textGravatar Denys Vlasenko2011-05-252-13/+20
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* small fixes atop syslog config patchGravatar Denys Vlasenko2011-04-162-8/+6
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: small fix to config patchGravatar Sergey Naumov2011-04-161-3/+9
| | | | | Signed-off-by: Sergey Naumov <sknaumov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* move remaining help text from include/usage.src.hGravatar Pere Orga2011-04-114-0/+54
| | | | | Signed-off-by: Pere Orga <gotrunks@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: optional support for /etc/syslog.confGravatar Sergey Naumov2011-04-102-65/+275
| | | | | | | | | | | | | | | function old new delta syslogd_main 1241 1870 +629 timestamp_and_log 301 540 +239 find_by_name - 37 +37 find_by_val - 22 +22 init_data 64 68 +4 log_locally 603 413 -190 ------------------------------------------------------------------------------ (add/remove: 2/0 grow/shrink: 3/1 up/down: 931/-190) Total: 741 bytes Signed-off-by: Sergey Naumov <sknaumov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* klogd: fix the problem of delayed handling of ^C and SIGTERMGravatar Denys Vlasenko2011-03-071-1/+30
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* Replace "depends on PLATFORM_LINUX" with "select PLATFORM_LINUX"Gravatar Denys Vlasenko2011-02-261-1/+2
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* add ENABLE_FEATURE_SYSTEMD and use it in syslogdGravatar Davide Cavalca2011-01-251-0/+5
| | | | | Signed-off-by: Davide Cavalca <davide@geexbox.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: whitespace fixesGravatar Denys Vlasenko2010-10-281-3/+3
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* klogd: do not log partial linesGravatar Denys Vlasenko2010-10-191-9/+10
| | | | | | | | function old new delta overlapping_strcpy 15 18 +3 klogd_main 438 436 -2 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: make GNU licensing statement forms more regularGravatar Denys Vlasenko2010-08-166-6/+6
| | | | | | | This change retains "or later" state! No licensing _changes_ here, only form is adjusted (article, space between "GPL" and "v2" and so on). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: close/re-resolve/reopen remote sockets on some sendto() errorsGravatar Daniel Dickinson2010-08-031-6/+20
| | | | | | | | function old new delta syslogd_main 1201 1262 +61 Signed-off-by: Daniel Dickinson <cshore@csolve.net> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* klogd: make it work on non-linux systemsGravatar Jeremie Koenig2010-08-012-19/+126
| | | | | | | | | | | | The klogctl() interface allows changing the console loglevel, but is Linux-specific. The more portable method of reading from _PATH_KLOG is added as an alternative. Adapted from the Debian kFreeBSD patch at: http://svn.debian.org/viewsvn/d-i/people/slackydeb/kfreebsd/busybox/1.14/debian/klogd.diff Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: trailing empty lines removedGravatar Denys Vlasenko2010-07-261-1/+0
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* mark Linux-specific configuration optionsGravatar Jeremie Koenig2010-07-191-0/+1
| | | | | | | | PLATFORM_LINUX is used as a dependency for applets or features which require Linux-specific interfaces. Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: add INSERTs to *.src files where appropriateGravatar Denys Vlasenko2010-06-082-0/+4
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* remove defconfig. Now "make defconfig" simply uses defaults from Config.inGravatar Denys Vlasenko2010-06-061-8/+8
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* mass renaming Kbuild -> Kbuild.src, Config.in -> Config.srcGravatar Denys Vlasenko2010-06-042-0/+0
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* fix Config.in tab usageGravatar Denys Vlasenko2010-03-311-8/+8
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: make maximum message length configurableGravatar Janne Kiviluoto2010-03-312-1/+11
| | | | | Signed-off-by: Janne Kiviluoto <janne.kiviluoto@bluegiga.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslog: allow multiple -R optionsGravatar Thomas Geulig2010-02-281-36/+50
| | | | | | | | | function old new delta syslogd_main 1082 1177 +95 init_data 72 64 -8 Signed-off-by: Thomas Geulig <geulig@nentec.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: suppress ~60% of "aliased warnings" on gcc-4.4.1Gravatar Denys Vlasenko2010-02-041-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslog: remove stray umask(0)Gravatar Denys Vlasenko2010-01-291-1/+1
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: remove some uses of argcGravatar Denys Vlasenko2010-01-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | function old new delta whoami_main 34 37 +3 logname_main 60 63 +3 hostid_main 35 38 +3 ttysize_main 136 135 -1 nmeter_main 673 672 -1 logger_main 387 386 -1 uuencode_main 330 328 -2 ifupdown_main 2125 2123 -2 mesg_main 158 155 -3 free_main 333 330 -3 cal_main 902 899 -3 acpid_main 443 440 -3 ar_main 196 189 -7 find_main 476 467 -9 ifconfig_main 1235 1221 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49) Total: -40 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: introduce and use ffulsh_all()Gravatar Denys Vlasenko2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | function old new delta buffer_fill_and_print 179 196 +17 fflush_all - 9 +9 spawn 87 92 +5 rtcwake_main 455 453 -2 ... alarm_intr 93 84 -9 readcmd 1072 1062 -10 bb_ask 345 333 -12 more_main 845 832 -13 flush_stdout_stderr 42 23 -19 xfflush_stdout 27 - -27 flush_stderr 30 - -30 ------------------------------------------------------------------------------ (add/remove: 1/2 grow/shrink: 2/50 up/down: 31/-397) Total: -366 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* *: more portability fixes by Dan FandrichGravatar Denys Vlasenko2009-09-231-1/+0
| | | | Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
* syslogd: added comment, no code changesGravatar Denis Vlasenko2009-04-221-0/+2
|