From 14339191afc5d77205487e3365ca2569f86afd44 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 3 Jul 2018 23:23:09 +0200 Subject: examples/var_service/: use standard logger script, viewer and pager scripts Signed-off-by: Denys Vlasenko --- examples/var_service/dhcp_if/README | 5 ----- examples/var_service/dhcp_if/log/run | 21 +------------------- examples/var_service/dhcp_if/p_log | 4 ---- examples/var_service/dhcp_if/w_log | 4 ---- examples/var_service/dhcp_if_pinger/README | 5 ----- examples/var_service/dhcpd_if/README | 5 ----- examples/var_service/dhcpd_if/log/run | 21 +------------------- examples/var_service/dhcpd_if/p_log | 4 ---- examples/var_service/dhcpd_if/w_log | 4 ---- examples/var_service/dnsmasq/log/run | 21 +------------------- examples/var_service/dnsmasq/p_log | 4 ---- examples/var_service/dnsmasq/w_log | 4 ---- examples/var_service/ftpd/README | 5 ----- examples/var_service/ftpd/log/run | 21 +------------------- examples/var_service/ftpd/p_log | 4 ---- examples/var_service/ftpd/w_log | 4 ---- examples/var_service/fw/README | 5 ----- examples/var_service/getty_tty1/README | 5 ----- examples/var_service/gpm/README | 5 ----- examples/var_service/httpd/README | 5 ----- examples/var_service/httpd/log/run | 21 +------------------- examples/var_service/httpd/p_log | 4 ---- examples/var_service/httpd/w_log | 4 ---- examples/var_service/ifplugd_if/README | 5 ----- examples/var_service/ifplugd_if/log/run | 21 +------------------- examples/var_service/ifplugd_if/p_log | 4 ---- examples/var_service/ifplugd_if/w_log | 4 ---- examples/var_service/inetd/README | 5 ----- examples/var_service/inetd/log/run | 21 +------------------- examples/var_service/inetd/p_log | 4 ---- examples/var_service/inetd/w_log | 4 ---- examples/var_service/nmeter/README | 5 ----- examples/var_service/ntpd/README | 5 ----- examples/var_service/ntpd/log/run | 21 +------------------- examples/var_service/ntpd/p_log | 4 ---- examples/var_service/ntpd/w_log | 4 ---- examples/var_service/std_service_logger | 32 ++++++++++++++++++++++++++++++ examples/var_service/supplicant_if/README | 5 ----- examples/var_service/supplicant_if/log/run | 21 +------------------- examples/var_service/supplicant_if/p_log | 4 ---- examples/var_service/supplicant_if/w_log | 4 ---- examples/var_service/sview | 19 ++++++++++++++++++ examples/var_service/svpage | 19 ++++++++++++++++++ examples/var_service/tftpd/README | 5 ----- examples/var_service/tftpd/log/run | 21 +------------------- examples/var_service/tftpd/p_log | 4 ---- examples/var_service/tftpd/w_log | 4 ---- examples/var_service/zcip_if/README | 5 ----- examples/var_service/zcip_if/log/run | 21 +------------------- examples/var_service/zcip_if/p_log | 4 ---- examples/var_service/zcip_if/w_log | 4 ---- 51 files changed, 81 insertions(+), 383 deletions(-) delete mode 100644 examples/var_service/dhcp_if/README delete mode 100755 examples/var_service/dhcp_if/p_log delete mode 100755 examples/var_service/dhcp_if/w_log delete mode 100644 examples/var_service/dhcp_if_pinger/README delete mode 100644 examples/var_service/dhcpd_if/README delete mode 100755 examples/var_service/dhcpd_if/p_log delete mode 100755 examples/var_service/dhcpd_if/w_log delete mode 100755 examples/var_service/dnsmasq/p_log delete mode 100755 examples/var_service/dnsmasq/w_log delete mode 100644 examples/var_service/ftpd/README delete mode 100755 examples/var_service/ftpd/p_log delete mode 100755 examples/var_service/ftpd/w_log delete mode 100644 examples/var_service/fw/README delete mode 100644 examples/var_service/getty_tty1/README delete mode 100644 examples/var_service/gpm/README delete mode 100644 examples/var_service/httpd/README delete mode 100755 examples/var_service/httpd/p_log delete mode 100755 examples/var_service/httpd/w_log delete mode 100644 examples/var_service/ifplugd_if/README delete mode 100755 examples/var_service/ifplugd_if/p_log delete mode 100755 examples/var_service/ifplugd_if/w_log delete mode 100644 examples/var_service/inetd/README delete mode 100755 examples/var_service/inetd/p_log delete mode 100755 examples/var_service/inetd/w_log delete mode 100644 examples/var_service/nmeter/README delete mode 100644 examples/var_service/ntpd/README delete mode 100755 examples/var_service/ntpd/p_log delete mode 100755 examples/var_service/ntpd/w_log create mode 100755 examples/var_service/std_service_logger delete mode 100644 examples/var_service/supplicant_if/README delete mode 100755 examples/var_service/supplicant_if/p_log delete mode 100755 examples/var_service/supplicant_if/w_log create mode 100755 examples/var_service/sview create mode 100755 examples/var_service/svpage delete mode 100644 examples/var_service/tftpd/README delete mode 100755 examples/var_service/tftpd/p_log delete mode 100755 examples/var_service/tftpd/w_log delete mode 100644 examples/var_service/zcip_if/README delete mode 100755 examples/var_service/zcip_if/p_log delete mode 100755 examples/var_service/zcip_if/w_log (limited to 'examples') diff --git a/examples/var_service/dhcp_if/README b/examples/var_service/dhcp_if/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/dhcp_if/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/dhcp_if/log/run b/examples/var_service/dhcp_if/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/dhcp_if/log/run +++ b/examples/var_service/dhcp_if/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/dhcp_if/p_log b/examples/var_service/dhcp_if/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/dhcp_if/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/dhcp_if/w_log b/examples/var_service/dhcp_if/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/dhcp_if/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/dhcp_if_pinger/README b/examples/var_service/dhcp_if_pinger/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/dhcp_if_pinger/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/dhcpd_if/README b/examples/var_service/dhcpd_if/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/dhcpd_if/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/dhcpd_if/log/run b/examples/var_service/dhcpd_if/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/dhcpd_if/log/run +++ b/examples/var_service/dhcpd_if/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/dhcpd_if/p_log b/examples/var_service/dhcpd_if/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/dhcpd_if/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/dhcpd_if/w_log b/examples/var_service/dhcpd_if/w_log deleted file mode 100755 index dba76c69b..000000000 --- a/examples/var_service/dhcpd_if/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir -watch -n1 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b0-$((w-2))' diff --git a/examples/var_service/dnsmasq/log/run b/examples/var_service/dnsmasq/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/dnsmasq/log/run +++ b/examples/var_service/dnsmasq/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/dnsmasq/p_log b/examples/var_service/dnsmasq/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/dnsmasq/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/dnsmasq/w_log b/examples/var_service/dnsmasq/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/dnsmasq/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/ftpd/README b/examples/var_service/ftpd/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/ftpd/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/ftpd/log/run b/examples/var_service/ftpd/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/ftpd/log/run +++ b/examples/var_service/ftpd/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/ftpd/p_log b/examples/var_service/ftpd/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/ftpd/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/ftpd/w_log b/examples/var_service/ftpd/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/ftpd/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/fw/README b/examples/var_service/fw/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/fw/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/getty_tty1/README b/examples/var_service/getty_tty1/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/getty_tty1/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/gpm/README b/examples/var_service/gpm/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/gpm/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/httpd/README b/examples/var_service/httpd/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/httpd/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/httpd/log/run b/examples/var_service/httpd/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/httpd/log/run +++ b/examples/var_service/httpd/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/httpd/p_log b/examples/var_service/httpd/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/httpd/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/httpd/w_log b/examples/var_service/httpd/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/httpd/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/ifplugd_if/README b/examples/var_service/ifplugd_if/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/ifplugd_if/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/ifplugd_if/log/run b/examples/var_service/ifplugd_if/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/ifplugd_if/log/run +++ b/examples/var_service/ifplugd_if/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/ifplugd_if/p_log b/examples/var_service/ifplugd_if/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/ifplugd_if/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/ifplugd_if/w_log b/examples/var_service/ifplugd_if/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/ifplugd_if/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/inetd/README b/examples/var_service/inetd/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/inetd/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/inetd/log/run b/examples/var_service/inetd/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/inetd/log/run +++ b/examples/var_service/inetd/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/inetd/p_log b/examples/var_service/inetd/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/inetd/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/inetd/w_log b/examples/var_service/inetd/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/inetd/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/nmeter/README b/examples/var_service/nmeter/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/nmeter/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/ntpd/README b/examples/var_service/ntpd/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/ntpd/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/ntpd/log/run b/examples/var_service/ntpd/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/ntpd/log/run +++ b/examples/var_service/ntpd/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/ntpd/p_log b/examples/var_service/ntpd/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/ntpd/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/ntpd/w_log b/examples/var_service/ntpd/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/ntpd/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/std_service_logger b/examples/var_service/std_service_logger new file mode 100755 index 000000000..ee68ad12b --- /dev/null +++ b/examples/var_service/std_service_logger @@ -0,0 +1,32 @@ +#!/bin/sh + +user=logger + +exec >/dev/null 2>&1 + +service="${PWD%/log}" +service="${service##*/}" +logdir="/var/log/service/$service" + +mkdir -p "$logdir" +chown -R "$user": "$logdir" +chmod -R go-rwxst,u+rwX "$logdir" +# TODO: if "$logdir/config" does not exist, +# based on service's preferences, write some setup in it: +# e.g. smaller nNUM directive ("I'm not that important, +# save 2 rather than default 10 one-megabyte log files") + +# Convenience symlink in this log/ directory: +rm logdir +ln -s "$logdir" logdir + +# Make current dir accessible to logger: +chmod a+rX . + +args="" +test "$LOG_NOTIMESTAMP" || args="-tt" + +exec \ +env - PATH="$PATH" \ +chpst -u "$user" -m $((20 * 1024*1024)) \ +svlogd $args "$logdir" diff --git a/examples/var_service/supplicant_if/README b/examples/var_service/supplicant_if/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/supplicant_if/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/supplicant_if/log/run b/examples/var_service/supplicant_if/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/supplicant_if/log/run +++ b/examples/var_service/supplicant_if/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/supplicant_if/p_log b/examples/var_service/supplicant_if/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/supplicant_if/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/supplicant_if/w_log b/examples/var_service/supplicant_if/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/supplicant_if/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/sview b/examples/var_service/sview new file mode 100755 index 000000000..716c1079c --- /dev/null +++ b/examples/var_service/sview @@ -0,0 +1,19 @@ +#!/bin/sh + +test "$1" || { + echo "Syntax: ${0##*/} SERVICE" + exit 1 +} + +test x"$1" = x"${1#*/}" -a x"$1" != x"." && { + # has no slashes and is not a "." + cd "/var/service/$1" || exit $? + set -- "." +} + +test -x "$1/view" && exec "$1/view" + +cd "log/logdir" || exit $? + +h=`ttysize h` +exec tail -n $((h-1)) -F current 2>&1 diff --git a/examples/var_service/svpage b/examples/var_service/svpage new file mode 100755 index 000000000..31c3d6dd7 --- /dev/null +++ b/examples/var_service/svpage @@ -0,0 +1,19 @@ +#!/bin/sh + +test "$1" || { + echo "Syntax: ${0##*/} SERVICE" + exit 1 +} + +test x"$1" = x"${1#*/}" -a x"$1" != x"." && { + # has no slashes and is not a "." + cd "/var/service/$1" || exit $? + set -- "." +} + +test -x "$1/page" && exec "$1/page" + +cd "log/logdir" || exit $? + +test "$PAGER" || PAGER=less +cat @* current | $PAGER diff --git a/examples/var_service/tftpd/README b/examples/var_service/tftpd/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/tftpd/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/tftpd/log/run b/examples/var_service/tftpd/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/tftpd/log/run +++ b/examples/var_service/tftpd/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/tftpd/p_log b/examples/var_service/tftpd/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/tftpd/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/tftpd/w_log b/examples/var_service/tftpd/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/tftpd/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' diff --git a/examples/var_service/zcip_if/README b/examples/var_service/zcip_if/README deleted file mode 100644 index 4ddccb22d..000000000 --- a/examples/var_service/zcip_if/README +++ /dev/null @@ -1,5 +0,0 @@ -The real README file is one directory up. - -This directory's run script can have useful comments. -If it doesn't but you feel it should, please send a patch -to busybox's mailing list. diff --git a/examples/var_service/zcip_if/log/run b/examples/var_service/zcip_if/log/run index 69d74b73f..756be4e7e 100755 --- a/examples/var_service/zcip_if/log/run +++ b/examples/var_service/zcip_if/log/run @@ -1,21 +1,2 @@ #!/bin/sh - -user=logger - -logdir="/var/log/service/`(cd ..;basename $PWD)`" -mkdir -p "$logdir" 2>/dev/null -chown -R "$user": "$logdir" -chmod -R go-rwxst,u+rwX "$logdir" -rm -rf logdir -ln -s "$logdir" logdir - -# make this dir accessible to logger -chmod a+rX . - -exec >/dev/null -exec 2>&1 -exec \ -env - PATH="$PATH" \ -softlimit \ -setuidgid "$user" \ -svlogd -tt "$logdir" +exec std_service_logger diff --git a/examples/var_service/zcip_if/p_log b/examples/var_service/zcip_if/p_log deleted file mode 100755 index a2521be05..000000000 --- a/examples/var_service/zcip_if/p_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -cat @* current | $PAGER diff --git a/examples/var_service/zcip_if/w_log b/examples/var_service/zcip_if/w_log deleted file mode 100755 index aa36ef13b..000000000 --- a/examples/var_service/zcip_if/w_log +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd log/logdir || exit 1 -watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' -- cgit v1.2.3