From 1473905fd7b31abafb54929fbd3c84e53cdc7841 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Sat, 28 Feb 2015 21:41:29 +0000 Subject: Update s6 example files Change -t to t for s6-log scripts: With the release of s6 v2.1.1.0 the -t flag to s6-log was depricated and replaced with a per-match control directive. This updates the example scripts to follow the current supported logging syntax. Update syslogd-linux example logger: It's helpful if you're doing syslog-style logging to split your log streams into different files in addition to a consolidated log. This change also splits the logging script out to be easier to manage. This also serves a second purpose of highlighting the fact that s6-log supports multiple log targets. Remove (most) absolute paths for non-init replacement s6-svscan: With non-slashpackage installs becoming the default, odds are that the execline and s6 binaries will be installed somewhere in the path. While all the example scripts still make calls to /command/execlineb, it makes sense to reduce the amount of editing needed to make these scripts work. Updating gitignore to skip trying to add vim turds --- examples/ROOT/img/services-local/klogd-linux/log/run | 2 +- examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE | 7 +++++++ examples/ROOT/img/services-local/syslogd-linux/log/run | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE (limited to 'examples/ROOT/img/services-local') diff --git a/examples/ROOT/img/services-local/klogd-linux/log/run b/examples/ROOT/img/services-local/klogd-linux/log/run index 66f2cd5..d9659e7 100755 --- a/examples/ROOT/img/services-local/klogd-linux/log/run +++ b/examples/ROOT/img/services-local/klogd-linux/log/run @@ -1,4 +1,4 @@ #!/command/execlineb -P s6-setuidgid klog exec -c -s6-log -t s1000000 n20 /var/log/klogd +s6-log t s1000000 n20 /var/log/klogd diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE new file mode 100644 index 0000000..814f95c --- /dev/null +++ b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE @@ -0,0 +1,7 @@ +- +^error\. t /var/log/syslogd/error +- +^authpriv\. t /var/log/syslogd/auth +- +^user\. t /var/log/syslogd/user +- +^messages\. t /var/log/syslogd/messages +- +^daemon\. t /var/log/syslogd/daemon +- f t /var/log/syslogd/misc + diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/run b/examples/ROOT/img/services-local/syslogd-linux/log/run index 0d99ba9..3cb4796 100755 --- a/examples/ROOT/img/services-local/syslogd-linux/log/run +++ b/examples/ROOT/img/services-local/syslogd-linux/log/run @@ -1,5 +1,7 @@ #!/command/execlineb -P +s6-envdir -f env +import -Cs LOGLINE s6-setuidgid syslog exec -c -s6-log -t s1000000 n20 /var/log/syslogd -# Change the logging script to alter s6-log's behaviour +s6-log $LOGLINE +# Change env/LOGLINE to alter s6-log's behaviour -- cgit v1.2.3