← Commit list

14339191a

Denys Vlasenko

2018-07-03

SUCCESS Duration: 147s

Subject

examples/var_service/: use standard logger script, viewer and pager scripts

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

examples/var_service/dhcp_if/README+0 -5

@@ -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.

examples/var_service/dhcp_if/log/run+1 -20

@@ -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

examples/var_service/dhcp_if/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/dhcp_if/w_log+0 -4

@@ -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))'

examples/var_service/dhcp_if_pinger/README+0 -5

@@ -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.

examples/var_service/dhcpd_if/README+0 -5

@@ -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.

examples/var_service/dhcpd_if/log/run+1 -20

@@ -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

examples/var_service/dhcpd_if/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/dhcpd_if/w_log+0 -4

@@ -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))'

examples/var_service/dnsmasq/log/run+1 -20

@@ -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

examples/var_service/dnsmasq/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/dnsmasq/w_log+0 -4

@@ -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))'

examples/var_service/ftpd/README+0 -5

@@ -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.

examples/var_service/ftpd/log/run+1 -20

@@ -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

examples/var_service/ftpd/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/ftpd/w_log+0 -4

@@ -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))'

examples/var_service/fw/README+0 -5

@@ -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.

examples/var_service/getty_tty1/README+0 -5

@@ -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.

examples/var_service/gpm/README+0 -5

@@ -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.

examples/var_service/httpd/README+0 -5

@@ -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.

examples/var_service/httpd/log/run+1 -20

@@ -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

examples/var_service/httpd/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/httpd/w_log+0 -4

@@ -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))'

examples/var_service/ifplugd_if/README+0 -5

@@ -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.

examples/var_service/ifplugd_if/log/run+1 -20

@@ -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

examples/var_service/ifplugd_if/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/ifplugd_if/w_log+0 -4

@@ -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))'

examples/var_service/inetd/README+0 -5

@@ -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.

examples/var_service/inetd/log/run+1 -20

@@ -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

examples/var_service/inetd/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/inetd/w_log+0 -4

@@ -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))'

examples/var_service/nmeter/README+0 -5

@@ -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.

examples/var_service/ntpd/README+0 -5

@@ -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.

examples/var_service/ntpd/log/run+1 -20

@@ -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

examples/var_service/ntpd/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/ntpd/w_log+0 -4

@@ -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))'

examples/var_service/std_service_logger+32 -0

@@ -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"

examples/var_service/supplicant_if/README+0 -5

@@ -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.

examples/var_service/supplicant_if/log/run+1 -20

@@ -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

examples/var_service/supplicant_if/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/supplicant_if/w_log+0 -4

@@ -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))'

examples/var_service/sview+19 -0

@@ -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

examples/var_service/svpage+19 -0

@@ -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

examples/var_service/tftpd/README+0 -5

@@ -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.

examples/var_service/tftpd/log/run+1 -20

@@ -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

examples/var_service/tftpd/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/tftpd/w_log+0 -4

@@ -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))'

examples/var_service/zcip_if/README+0 -5

@@ -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.

examples/var_service/zcip_if/log/run+1 -20

@@ -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

examples/var_service/zcip_if/p_log+0 -4

@@ -1,4 +0,0 @@
-	#!/bin/sh
-
-	cd log/logdir \|\| exit 1
-	cat @* current \| $PAGER

examples/var_service/zcip_if/w_log+0 -4

@@ -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))'