Revert "periodicstats: 1.4.2"

This reverts commit e5028b2980.
This commit is contained in:
Amin Ben Romdhane 2023-05-31 16:04:10 +02:00
parent 729eeaba54
commit e5704ad7f2
3 changed files with 12 additions and 48 deletions

View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=periodicstats PKG_NAME:=periodicstats
PKG_VERSION:=1.4.2 PKG_VERSION:=1.4.1
LOCAL_DEV:=0 LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1) ifneq ($(LOCAL_DEV),1)
@ -42,9 +42,9 @@ define Package/periodicstats/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(INSTALL_DIR) $(1)/usr $(INSTALL_DIR) $(1)/usr
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_DIR) $(1)/etc/bbfdm/services $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/etc/bbfdm/services/periodicstats $(INSTALL_DIR) $(1)/usr/lib/bbfdm
$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/bbfdm/services/periodicstats $(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm
$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
endef endef

View file

@ -1,30 +0,0 @@
{
"daemon": {
"config": {
"refresh_time": 3600,
"enable_plugins": 0
},
"input": {
"type": "DotSo",
"name": "/etc/bbfdm/services/periodicstats/libperiodicstats.so"
},
"output": {
"type": "UBUS",
"name": "bbfdm.periodicstats"
}
},
"client": {
"config": {
"proto": "both",
"instance_mode": 0,
"enable_plugins": 0
},
"input": {
"type": "UBUS",
"name": "bbfdm.periodicstats"
},
"output": {
"type": "CLI"
}
}
}

View file

@ -4,9 +4,7 @@ START=99
STOP=01 STOP=01
USE_PROCD=1 USE_PROCD=1
PROG="/usr/sbin/periodicstatsd" PROG=/usr/sbin/periodicstatsd
BBFDMD_PROG="/usr/sbin/bbfdmd"
PERIODICSTATS_JSON_INPUT="/etc/bbfdm/services/periodicstats/input.json"
start_service() { start_service() {
local enable local enable
@ -14,18 +12,14 @@ start_service() {
config_load periodicstats config_load periodicstats
config_get_bool enable globals enable 1 config_get_bool enable globals enable 1
procd_open_instance "bbfdm.periodicstats" if [ "${enable}" -ne "1" ]; then
procd_set_param command "$BBFDMD_PROG" return 0;
procd_append_param command -I "${PERIODICSTATS_JSON_INPUT}"
procd_set_param respawn
procd_close_instance "bbfdm.periodicstats"
if [ "${enable}" -eq "1" ]; then
procd_open_instance "periodicstatsd"
procd_set_param command ${PROG}
procd_set_param respawn
procd_close_instance "periodicstatsd"
fi fi
procd_open_instance periodicstatsd
procd_set_param command ${PROG}
procd_set_param respawn
procd_close_instance
} }
service_triggers() { service_triggers() {