diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-07-03 23:23:09 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-07-03 23:23:09 +0200 |
commit | 14339191afc5d77205487e3365ca2569f86afd44 (patch) | |
tree | 95fdd8f36e2dcf61126bbbdfe55c735562bcac7e | |
parent | aa75a7da7f3b0bb50be82f535244137bae423fa8 (diff) | |
download | busybox-w32-14339191afc5d77205487e3365ca2569f86afd44.tar.gz busybox-w32-14339191afc5d77205487e3365ca2569f86afd44.tar.bz2 busybox-w32-14339191afc5d77205487e3365ca2569f86afd44.zip |
examples/var_service/: use standard logger script, viewer and pager scripts
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
51 files changed, 81 insertions, 383 deletions
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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir | ||
4 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | user=logger | ||
4 | |||
5 | exec >/dev/null 2>&1 | ||
6 | |||
7 | service="${PWD%/log}" | ||
8 | service="${service##*/}" | ||
9 | logdir="/var/log/service/$service" | ||
10 | |||
11 | mkdir -p "$logdir" | ||
12 | chown -R "$user": "$logdir" | ||
13 | chmod -R go-rwxst,u+rwX "$logdir" | ||
14 | # TODO: if "$logdir/config" does not exist, | ||
15 | # based on service's preferences, write some setup in it: | ||
16 | # e.g. smaller nNUM directive ("I'm not that important, | ||
17 | # save 2 rather than default 10 one-megabyte log files") | ||
18 | |||
19 | # Convenience symlink in this log/ directory: | ||
20 | rm logdir | ||
21 | ln -s "$logdir" logdir | ||
22 | |||
23 | # Make current dir accessible to logger: | ||
24 | chmod a+rX . | ||
25 | |||
26 | args="" | ||
27 | test "$LOG_NOTIMESTAMP" || args="-tt" | ||
28 | |||
29 | exec \ | ||
30 | env - PATH="$PATH" \ | ||
31 | chpst -u "$user" -m $((20 * 1024*1024)) \ | ||
32 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | test "$1" || { | ||
4 | echo "Syntax: ${0##*/} SERVICE" | ||
5 | exit 1 | ||
6 | } | ||
7 | |||
8 | test x"$1" = x"${1#*/}" -a x"$1" != x"." && { | ||
9 | # has no slashes and is not a "." | ||
10 | cd "/var/service/$1" || exit $? | ||
11 | set -- "." | ||
12 | } | ||
13 | |||
14 | test -x "$1/view" && exec "$1/view" | ||
15 | |||
16 | cd "log/logdir" || exit $? | ||
17 | |||
18 | h=`ttysize h` | ||
19 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | test "$1" || { | ||
4 | echo "Syntax: ${0##*/} SERVICE" | ||
5 | exit 1 | ||
6 | } | ||
7 | |||
8 | test x"$1" = x"${1#*/}" -a x"$1" != x"." && { | ||
9 | # has no slashes and is not a "." | ||
10 | cd "/var/service/$1" || exit $? | ||
11 | set -- "." | ||
12 | } | ||
13 | |||
14 | test -x "$1/page" && exec "$1/page" | ||
15 | |||
16 | cd "log/logdir" || exit $? | ||
17 | |||
18 | test "$PAGER" || PAGER=less | ||
19 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | The real README file is one directory up. | ||
2 | |||
3 | This directory's run script can have useful comments. | ||
4 | If it doesn't but you feel it should, please send a patch | ||
5 | 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | exec std_service_logger | |
3 | user=logger | ||
4 | |||
5 | logdir="/var/log/service/`(cd ..;basename $PWD)`" | ||
6 | mkdir -p "$logdir" 2>/dev/null | ||
7 | chown -R "$user": "$logdir" | ||
8 | chmod -R go-rwxst,u+rwX "$logdir" | ||
9 | rm -rf logdir | ||
10 | ln -s "$logdir" logdir | ||
11 | |||
12 | # make this dir accessible to logger | ||
13 | chmod a+rX . | ||
14 | |||
15 | exec >/dev/null | ||
16 | exec 2>&1 | ||
17 | exec \ | ||
18 | env - PATH="$PATH" \ | ||
19 | softlimit \ | ||
20 | setuidgid "$user" \ | ||
21 | svlogd -tt "$logdir" | ||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | cd log/logdir || exit 1 | ||
4 | watch -n2 'w=`ttysize w`; h=`ttysize h`; tail -$((h-3)) current 2>&1 | cut -b1-$((w-2))' | ||