Skip to content

Commit df4955b

Browse files
[refactor] Remove unnecessary log messages from init script
1 parent 21664a1 commit df4955b

1 file changed

Lines changed: 3 additions & 22 deletions

File tree

openwrt-openwisp-monitoring/files/monitoring.init

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@ time_to_seconds() {
2323
unset time
2424
}
2525

26-
log() {
27-
level="$1"
28-
shift
29-
30-
case "$level" in
31-
-i) level=daemon.info ;;
32-
-w) level=daemon.warn ;;
33-
-e) level=daemon.err ;;
34-
esac
35-
36-
logger -s "$@" -p "$level" -t openwisp-monitoring
37-
38-
[ "$level" = daemon.err ] && exit 1
39-
}
40-
4126
start_service() {
4227
# for openwisp-config
4328
config_load openwisp
@@ -54,10 +39,6 @@ start_service() {
5439
[ -n "$key" ] && key="--key $key"
5540
[ -n "$verify_ssl" ] && verify_ssl="--verify_ssl $verify_ssl"
5641

57-
[ -z "$base_url" ] && log -e "url is not set, please add it to /etc/config/openwisp"
58-
59-
[ -z "$uuid" ] || [ -z "$key" ] && log -e "uuid or key are not set, please add these to /etc/config/openwisp"
60-
6142
# for openwisp-monitoring
6243
config_load openwisp-monitoring
6344
config_get monitored_interfaces monitoring monitored_interfaces "*"
@@ -67,7 +48,7 @@ start_service() {
6748
config_get max_retries monitoring max_retries "5"
6849

6950
interval="$(time_to_seconds "$interval")"
70-
[ "$interval" -lt 1 ] && log -e "Interval is invalid. Use time value(eg: '10', '2m', '3h', '1d')"
51+
[ -z "$interval" ] && { echo "Interval is invalid. Use time value(eg: '10', '2m', '3h', '1d')" 1>&2 && exit 1; }
7152

7253
interval="--interval $interval"
7354
verbose="--verbose_mode ${verbose_mode:-0}"
@@ -88,11 +69,11 @@ start_service() {
8869
procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
8970
procd_close_instance
9071

91-
log -i "$PROG_NAME started"
72+
logger -s "$PROG_NAME started" -t openwisp-monitoring -p daemon.info
9273
}
9374

9475
stop_service() {
95-
log -i "$PROG_NAME stopping"
76+
logger -s "$PROG_NAME stopping" -t openwisp-monitoring -p daemon.info
9677
}
9778

9879
service_triggers() {

0 commit comments

Comments
 (0)