[PATCH 1/4] nodewatcher.d: Move $(date) to debug function
Fabian Bläse
fabian at blaese.de
So Apr 19 15:40:17 CEST 2020
By moving the $(date) output to the debug function,
the actual debug commands can be simplified.
Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
.../files/usr/lib/nodewatcher.d/30-batman-adv.sh | 6 +++---
.../files/usr/lib/nodewatcher.d/20-interfaces.sh | 4 ++--
.../files/usr/lib/nodewatcher.d/50-clients.sh | 4 ++--
.../files/usr/lib/nodewatcher.d/10-systemdata.sh | 8 ++++----
.../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/packages/fff/fff-batman-adv/files/usr/lib/nodewatcher.d/30-batman-adv.sh b/src/packages/fff/fff-batman-adv/files/usr/lib/nodewatcher.d/30-batman-adv.sh
index 5fe4d89..bbec4ed 100755
--- a/src/packages/fff/fff-batman-adv/files/usr/lib/nodewatcher.d/30-batman-adv.sh
+++ b/src/packages/fff/fff-batman-adv/files/usr/lib/nodewatcher.d/30-batman-adv.sh
@@ -3,10 +3,10 @@
# License; GPL v3
debug() {
- (>&2 echo "$1")
+ (>&2 echo "$(date): $1")
}
-debug "$(date): Collecting information from batman advanced and its interfaces"
+debug "Collecting information from batman advanced and its interfaces"
if [ -f /sys/module/batman_adv/version ]; then
for iface in $(batctl if | sed 's/ //'); do
@@ -53,7 +53,7 @@ if [ -f /sys/module/batman_adv/version ]; then
echo -n "<batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list>"
else
- debug "$(date): No batman data .."
+ debug "No batman data .."
exit 1
fi
diff --git a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh
index acb1eee..f5b89b8 100755
--- a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh
+++ b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/20-interfaces.sh
@@ -6,7 +6,7 @@ IFACEBLACKLIST=$(uci get nodewatcher. at network[0].iface_blacklist)
IPWHITELIST=$(uci get nodewatcher. at network[0].ip_whitelist)
debug() {
- (>&2 echo "$1")
+ (>&2 echo "$(date): $1")
}
inArray() {
@@ -17,7 +17,7 @@ inArray() {
return 1
}
-debug "$(date): Collecting information from network interfaces"
+debug "Collecting information from network interfaces"
interface_data=""
diff --git a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh
index c4a0a61..2264748 100755
--- a/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh
+++ b/src/packages/fff/fff-network/files/usr/lib/nodewatcher.d/50-clients.sh
@@ -5,10 +5,10 @@
MESH_INTERFACE=$(uci get nodewatcher. at network[0].mesh_interface)
debug() {
- (>&2 echo "$1")
+ (>&2 echo "$(date): $1")
}
-debug "$(date): Collecting information about connected clients"
+debug "Collecting information about connected clients"
client_count=0
dataclient=""
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
index c9a315e..814a830 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
+++ b/src/packages/fff/fff-nodewatcher/files/usr/lib/nodewatcher.d/10-systemdata.sh
@@ -6,10 +6,10 @@ SCRIPT_STATUS_FILE=$(uci get nodewatcher. at script[0].status_text_file)
SCRIPT_VERSION=$(cat /etc/nodewatcher_version)
debug() {
- (>&2 echo "$1")
+ (>&2 echo "$(date): $1")
}
-debug "$(date): Collecting basic system status data"
+debug "Collecting basic system status data"
SYSTEM_DATA="<status>online</status>"
@@ -59,7 +59,7 @@ SYSTEM_DATA="$SYSTEM_DATA<local_time>$(date +%s)</local_time>"
load=$(awk '{ printf "<loadavg>"$3"</loadavg><processes>"$4"</processes>" }' /proc/loadavg)
SYSTEM_DATA="$SYSTEM_DATA$load"
-debug "$(date): Collecting version information"
+debug "Collecting version information"
SYSTEM_DATA="$SYSTEM_DATA<batman_advanced_version>$(cat /sys/module/batman_adv/version)</batman_advanced_version>"
SYSTEM_DATA="$SYSTEM_DATA<kernel_version>$(uname -r)</kernel_version>"
@@ -95,7 +95,7 @@ SYSTEM_DATA="$SYSTEM_DATA<firmware_revision>$BUILD_DATE</firmware_revision>"
SYSTEM_DATA="$SYSTEM_DATA<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
SYSTEM_DATA="$SYSTEM_DATA<openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
-debug "$(date): Collecting hood information and additional status data"
+debug "Collecting hood information and additional status data"
SYSTEM_DATA="$SYSTEM_DATA<hood>$(uci -q get "system. at system[0].hood")</hood>"
SYSTEM_DATA="$SYSTEM_DATA<hoodid>$(uci -q get "system. at system[0].hoodid")</hoodid>"
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 21880fb..8da7877 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -20,7 +20,7 @@ SCRIPT_DATA_FILE=$(uci get nodewatcher. at script[0].data_file)
if [ "$SCRIPT_ERROR_LEVEL" -gt "1" ]; then
debug() {
- echo "$1" >> "$SCRIPT_LOGFILE"
+ echo "$(date): $1" >> "$SCRIPT_LOGFILE"
}
else
debug() {
@@ -33,7 +33,7 @@ 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"
+ debug "Logfile has been made smaller"
fi
fi
}
@@ -41,7 +41,7 @@ delete_log() {
#This method generates the crawl data XML file that is being fetched by netmon
#and provided by a small local httpd
crawl() {
- debug "$(date): Putting all information into a XML-File and save it at $SCRIPT_DATA_FILE"
+ debug "Putting all information into a XML-File and save it at $SCRIPT_DATA_FILE"
DATA="<?xml version='1.0' standalone='yes'?><data>"
@@ -61,11 +61,11 @@ crawl() {
LANG=C
#Prüft ob das logfile zu groß geworden ist
-debug "$(date): Check logfile"
+debug "Check logfile"
delete_log
#Erzeugt die statusdaten
-debug "$(date): Generate actual status data"
+debug "Generate actual status data"
crawl
exit 0
--
2.26.0
Mehr Informationen über die Mailingliste franken-dev