[PATCH v2 2/5] nodewatcher: Output to stderr instead of log file

[mail at adrianschmutzler.de]

Reviewed-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Fabian Bläse
> Sent: Mittwoch, 22. April 2020 16:05
> To: franken-dev at freifunk.net
> Subject: [PATCH v2 2/5] nodewatcher: Output to stderr instead of log file
> 
> Maintaining a logfile manually is complicated and has no major improvements
> over just logging to stderr, because nodewatcher is no deamon and can be
> run manually for debugging purposes.
> 
> Also, the debug output from subscripts currently is not written to the log file
> anyway and the debug level is not used eiher.
> 
> Therefore, the file logging and debug level is removed from nodewatcher,
> which simplifies the code a bit.
> 
> Signed-off-by: Fabian Bläse <fabian at blaese.de>
> ---
> Changes in v2:
> - Also remove deprecated uci values in uci-defaults
> - Change patch order, therefore $(date) is not part of the debug function
> ---
>  .../files/etc/uci-defaults/93-fff-nodewatcher |  2 --
>  .../files/usr/sbin/nodewatcher                | 26 ++-----------------
>  2 files changed, 2 insertions(+), 26 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-
> nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-
> fff-nodewatcher
> index 77f62bd..5c2d4e3 100644
> --- a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-
> nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nod
> +++ ewatcher
> @@ -2,8 +2,6 @@ touch /etc/config/nodewatcher
> 
>  uci batch <<EOF
>    add nodewatcher script
> -  set nodewatcher. at script[-1].error_level='0'
> -  set nodewatcher. at script[-1].logfile='/var/log/nodewatcher.log'
>    set nodewatcher. at script[-1].data_file='/tmp/crawldata/node.data'
>    set nodewatcher. at script[-1].status_text_file='/tmp/status.txt'
>  EOF
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index 21880fb..51b3e9e 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -14,28 +14,10 @@ trap "lock -u \"$lockfile\"" INT TERM EXIT
> 
>  [ -s /etc/config/nodewatcher ] || exit 1
> 
> -SCRIPT_ERROR_LEVEL=$(uci get nodewatcher. at script[0].error_level)
> -SCRIPT_LOGFILE=$(uci get nodewatcher. at script[0].logfile)
> SCRIPT_DATA_FILE=$(uci get nodewatcher. at script[0].data_file)
> 
> -if [ "$SCRIPT_ERROR_LEVEL" -gt "1" ]; then
> -	debug() {
> -		echo "$1" >> "$SCRIPT_LOGFILE"
> -	}
> -else
> -	debug() {
> -		:
> -	}
> -fi
> -
> -#This method checks if the log file has become too big and deletes the first X
> lines
> -delete_log() {
> -	if [ -f "$SCRIPT_LOGFILE" ]; then
> -		if [ "$(find "$SCRIPT_LOGFILE" -printf "%s")" -gt "6000" ]; then
> -			sed -i '1,60d' "$SCRIPT_LOGFILE"
> -			debug "$(date): Logfile has been made smaller"
> -		fi
> -	fi
> +debug() {
> +	(>&2 echo "$1")
>  }
> 
>  #This method generates the crawl data XML file that is being fetched by
> netmon @@ -60,10 +42,6 @@ crawl() {
> 
>  LANG=C
> 
> -#Prüft ob das logfile zu groß geworden ist -debug "$(date): Check logfile"
> -delete_log
> -
>  #Erzeugt die statusdaten
>  debug "$(date): Generate actual status data"
>  crawl
> --
> 2.26.2
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : openpgp-digital-signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200422/e2c5ab2f/attachment.sig>