Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add flags for debug log enabling #57

Merged
merged 13 commits into from
Nov 26, 2022
Merged

add flags for debug log enabling #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7f89b80
snap: layout: add rbfeeder.log
tsunghanliu Nov 26, 2022
5982184
bin/graphs-gend: add flag for logs
tsunghanliu Nov 26, 2022
a335bc3
bin/collectd: add flag for logs
tsunghanliu Nov 26, 2022
cca59e3
bin/piaware: add flag for logs
tsunghanliu Nov 26, 2022
95b2d87
bin/dump1090: add flag for logs
tsunghanliu Nov 26, 2022
a5235dd
bin/rbfeeder*: add flag for logs
tsunghanliu Nov 26, 2022
e4d1657
bin/fr24feed*: add flag for logs
tsunghanliu Nov 26, 2022
9314106
bin/piaware*: add flag for logs
tsunghanliu Nov 26, 2022
7c1f56b
bin/adsbexchange*: add flag for logs
tsunghanliu Nov 26, 2022
c8ace45
bin/dump978: add flag for logs
tsunghanliu Nov 26, 2022
013a350
bin/pfclientd: add flag for logs
tsunghanliu Nov 26, 2022
a9c1305
bin/lighttpd: add flag for logs
tsunghanliu Nov 26, 2022
5c57a0a
bin/openskyd: add flag for logs
tsunghanliu Nov 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion bin/adsbexchange-mlat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get adsbexchange.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# delay for dump1090
sleep 3
Expand Down
7 changes: 6 additions & 1 deletion bin/adsbexchange-netcat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get adsbexchange.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# wait until all required interfaces are connected
PLUGS="network-observe"
Expand Down
6 changes: 5 additions & 1 deletion bin/collectd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#! /bin/bash

set -x
ENABLE_LOG=$(snapctl get collectd.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

WORKDIR=$SNAP_DATA/collectd
CONF=$WORKDIR/collectd.conf
Expand Down
7 changes: 6 additions & 1 deletion bin/dump1090
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
#set -x

ENABLE_LOG=$(snapctl get dump1090.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

BIN="$SNAP/usr/bin/dump1090-fa"
ARGS=()
Expand Down
7 changes: 6 additions & 1 deletion bin/dump978
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
#set -x

ENABLE_LOG=$(snapctl get dump978.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# get index/serial of receiver
dev_index=$(snapctl get receiver.dump978.index)
Expand Down
8 changes: 6 additions & 2 deletions bin/fr24feed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get fr24feed.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# delay for dump1090
sleep 3
Expand Down Expand Up @@ -70,7 +75,6 @@ fi

ARGS=("--monitor-file=$MONITORFILE" "--write-pid=$PIDFILE")

ENABLE_LOG=$(snapctl get fr24feed.enable-log)
case "$ENABLE_LOG" in
1|[Oo][Nn]|[Tt][Rr][Uu][Ee])
;;
Expand Down
7 changes: 6 additions & 1 deletion bin/fr24feed-status
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
# ported from /etc/init.d/fr24feed carried in fr24feed.deb

set -e
#set -x

ENABLE_LOG=$(snapctl get fr24feed.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# From bin/fr24feed
WORKDIR="$SNAP_DATA/fr24feed"
Expand Down
7 changes: 6 additions & 1 deletion bin/fr24feedcli
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
set -e
#set -x

ENABLE_LOG=$(snapctl get fr24feed.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

CONF="/etc/fr24feed.ini"

Expand Down
11 changes: 9 additions & 2 deletions bin/graphs-gend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash

#set -x
ENABLE_LOG=$(snapctl get graphs-gend.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}

if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# wait until all required interfaces are connected
PLUGS="process-control"
Expand Down Expand Up @@ -69,7 +74,9 @@ mkdir -p /tmp/graphs

gen_graphs()
{
echo "[$(date +"%F %T")] run cmd, arg=$*"
if [ "$ENABLE_LOG" != "0" ]; then
echo "[$(date +"%F %T")] run cmd, arg=$*"
fi
nice -n 5 "$SNAP/usr/share/graphs1090/graphs1090.sh" "$1" 0.7 >/dev/null 2>&1
}

Expand Down
7 changes: 6 additions & 1 deletion bin/lighttpd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#! /bin/sh

ENABLE_LOG=$(snapctl get collectd.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

WORKDIR=$SNAP_DATA/lighttpd
CONF=$WORKDIR/lighttpd.conf
BIN=$SNAP/usr/sbin/lighttpd
Expand Down Expand Up @@ -122,7 +128,6 @@ accesslog.filename = "$ACCESS_LOG"

EOF

ENABLE_LOG=$(snapctl get lighttpd.enable-localhost-log)
case "$ENABLE_LOG" in
1|on|ON|true|TRUE)
# no restrictions of access logs
Expand Down
7 changes: 6 additions & 1 deletion bin/openskyd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
set -e
set -x

ENABLE_LOG=$(snapctl get openskyd.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# delay for dump1090
sleep 3
Expand Down
8 changes: 6 additions & 2 deletions bin/pfclientd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get plane-finder.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# delay for dump1090
sleep 3
Expand All @@ -21,7 +26,6 @@ fi

ARGS=("-i" "$PIDFILE" "-z" "$CONFIGFILE")

ENABLE_LOG=$(snapctl get plane-finder.enable-log)
case "$ENABLE_LOG" in
1|on|ON|true|TRUE)
ARGS+=("-y" "$LOGDIR")
Expand Down
8 changes: 6 additions & 2 deletions bin/piaware
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get piaware.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# delay for dump1090
sleep 3
Expand Down Expand Up @@ -81,7 +86,6 @@ ARGS=("-p" "$PIDFILE"
"-cachedir" "$CACHEDIR"
"-statusfile" "$STATUSFILE")

ENABLE_LOG=$(snapctl get piaware.enable-log)
case "$ENABLE_LOG" in
1|on|ON|true|TRUE)
ARGS+=("-logfile" "$LOGFILE")
Expand Down
7 changes: 6 additions & 1 deletion bin/piaware-config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
set -e
#set -x

ENABLE_LOG=$(snapctl get piaware.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib

Expand Down
7 changes: 6 additions & 1 deletion bin/piaware-status
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/sh
set -e
#set -x

ENABLE_LOG=$(snapctl get piaware.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib

Expand Down
9 changes: 7 additions & 2 deletions bin/rbfeeder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get rbfeeder.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

BIN="$SNAP/usr/bin/rbfeeder"

Expand Down Expand Up @@ -36,8 +41,8 @@ RBFEEDER_INI="$WORKDIR/rbfeeder.ini"

if [ ! -f "$RBFEEDER_INI" ]; then
cp "$SNAP/etc/rbfeeder.ini" "$RBFEEDER_INI"
sed -i 's/\/var\/log\/rbfeeder.log/\/dev\/null/' "$RBFEEDER_INI"
fi
sed -i 's/\/var\/log\/rbfeeder.log/\/dev\/null/' "$RBFEEDER_INI"

if [ -n "$(snapctl get receiver.dump978.index)" ] || [ -n "$(snapctl get receiver.dump978.serial)" ]; then
# add dump978 settings
Expand Down
7 changes: 6 additions & 1 deletion bin/rbfeeder-mlat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
set -x

ENABLE_LOG=$(snapctl get rbfeeder.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

if [ ! -f "$SNAP/usr/bin/rbfeeder" ]; then
echo "The rbfeeder does not exist. Maybe the architecture($SNAP_ARCH) is not supported."
Expand Down
7 changes: 6 additions & 1 deletion bin/skyaware978
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#!/bin/bash
set -e
#set -x

ENABLE_LOG=$(snapctl get skyaware978.enable-log)
ENABLE_LOG=${ENABLE_LOG:-0}
if [ "$ENABLE_LOG" != "0" ]; then
set -x
fi

# get index/serial of receiver
dev_index=$(snapctl get receiver.dump978.index)
Expand Down
2 changes: 2 additions & 0 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,5 @@ layout:
bind: $SNAP_DATA/openskyd
/etc/fonts:
bind: $SNAP/etc/fonts
/var/log/rbfeeder.log:
bind-file: $SNAP_DATA/rbfeeder.log