From 7037416469934787a21da58d1aa70354e1a93cb8 Mon Sep 17 00:00:00 2001 From: Zlika Date: Sat, 11 May 2019 08:39:55 +0200 Subject: [PATCH 1/2] Add option to disable logs --- board/recalbox/fsoverlay/usr/bin/recallog | 5 +++++ package/virtualgamepads/S92virtualgamepads | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/board/recalbox/fsoverlay/usr/bin/recallog b/board/recalbox/fsoverlay/usr/bin/recallog index ca4aec2e09..06d484ab2e 100755 --- a/board/recalbox/fsoverlay/usr/bin/recallog +++ b/board/recalbox/fsoverlay/usr/bin/recallog @@ -24,6 +24,11 @@ log="/recalbox/share/system/logs/${filename}" [ ! -d /recalbox/share/system/logs ] && log="/tmp/logappend-${filename}" +# Disable log if setting "system.extendsdcardlife.enabled" is set +systemsetting="python /usr/lib/python2.7/site-packages/configgen/settings/recalboxSettings.pyc" +extendsdcardlife="`$systemsetting -command load -key system.extendsdcardlife.enabled default 0`" +[ "$extendsdcardlife" == "1" ] && log="/dev/null" + if [[ -z "$comment" ]];then while read line do diff --git a/package/virtualgamepads/S92virtualgamepads b/package/virtualgamepads/S92virtualgamepads index 8e1e9630e4..e33355e422 100755 --- a/package/virtualgamepads/S92virtualgamepads +++ b/package/virtualgamepads/S92virtualgamepads @@ -7,6 +7,7 @@ systemsetting="python /usr/lib/python2.7/site-packages/configgen/settings/recalb logfile="/recalbox/share/system/logs/virtualgamepads.log" logswitch_default="1" loglevel_default="info" +extendsdcardlife_default="0" case "$1" in start) @@ -23,12 +24,11 @@ case "$1" in fi cd /usr/node-virtual-gamepads/ - logswitch="`$systemsetting -command load -key system.virtual-gamepads.log.enabled`" - loglevel="`$systemsetting -command load -key system.virtual-gamepads.log.level`" - if [ -z "$logswitch" ];then logswitch="$logswitch_default"; fi - if [ -z "$loglevel" ];then loglevel="$loglevel_default"; fi + logswitch="`$systemsetting -command load -key system.virtual-gamepads.log.enabled -default $logswitch_default`" + loglevel="`$systemsetting -command load -key system.virtual-gamepads.log.level default $loglevel_default`" + extendsdcardlife="`$systemsetting -command load -key system.extendsdcardlife.enabled default $extendsdcardlife_default`" echo "Starting virtual-gamepads server logging=$logswitch, loglevel=$loglevel" - if [ "$logswitch" == "1" ];then + if [ "$logswitch" == "1" ] && [ "$extendsdcardlife" == "0" ];then mv $logfile $logfile.old PORT=8080 LOGLEVEL=$loglevel node virtualgamepads.js > "$logfile" 2>&1 & else -- GitLab From 21cdbab437eb560f59476dfefd76d0a312747a1c Mon Sep 17 00:00:00 2001 From: Zlika Date: Sat, 18 May 2019 14:08:20 +0200 Subject: [PATCH 2/2] Fix recallog --- board/recalbox/fsoverlay/usr/bin/recallog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/recalbox/fsoverlay/usr/bin/recallog b/board/recalbox/fsoverlay/usr/bin/recallog index 06d484ab2e..feab128ef2 100755 --- a/board/recalbox/fsoverlay/usr/bin/recallog +++ b/board/recalbox/fsoverlay/usr/bin/recallog @@ -26,7 +26,7 @@ log="/recalbox/share/system/logs/${filename}" # Disable log if setting "system.extendsdcardlife.enabled" is set systemsetting="python /usr/lib/python2.7/site-packages/configgen/settings/recalboxSettings.pyc" -extendsdcardlife="`$systemsetting -command load -key system.extendsdcardlife.enabled default 0`" +extendsdcardlife="`$systemsetting -command load -key system.extendsdcardlife.enabled -default 0`" [ "$extendsdcardlife" == "1" ] && log="/dev/null" if [[ -z "$comment" ]];then -- GitLab