diff --git a/periodicstats/Makefile b/periodicstats/Makefile index e6a13246f..b286f1e11 100644 --- a/periodicstats/Makefile +++ b/periodicstats/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=periodicstats -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.4.1 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -42,9 +42,9 @@ define Package/periodicstats/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_DIR) $(1)/etc/bbfdm/services - $(INSTALL_DIR) $(1)/etc/bbfdm/services/periodicstats - $(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/bbfdm/services/periodicstats + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/bbfdm + $(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm $(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin endef diff --git a/periodicstats/files/etc/bbfdm/services/periodicstats/input.json b/periodicstats/files/etc/bbfdm/services/periodicstats/input.json deleted file mode 100755 index bebdf3126..000000000 --- a/periodicstats/files/etc/bbfdm/services/periodicstats/input.json +++ /dev/null @@ -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" - } - } -} diff --git a/periodicstats/files/etc/init.d/periodicstats b/periodicstats/files/etc/init.d/periodicstats index dd07c6e69..0bcdd92c4 100755 --- a/periodicstats/files/etc/init.d/periodicstats +++ b/periodicstats/files/etc/init.d/periodicstats @@ -4,9 +4,7 @@ START=99 STOP=01 USE_PROCD=1 -PROG="/usr/sbin/periodicstatsd" -BBFDMD_PROG="/usr/sbin/bbfdmd" -PERIODICSTATS_JSON_INPUT="/etc/bbfdm/services/periodicstats/input.json" +PROG=/usr/sbin/periodicstatsd start_service() { local enable @@ -14,18 +12,14 @@ start_service() { config_load periodicstats config_get_bool enable globals enable 1 - procd_open_instance "bbfdm.periodicstats" - procd_set_param command "$BBFDMD_PROG" - 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" + if [ "${enable}" -ne "1" ]; then + return 0; fi + + procd_open_instance periodicstatsd + procd_set_param command ${PROG} + procd_set_param respawn + procd_close_instance } service_triggers() {