diff --git a/periodicstats/Makefile b/periodicstats/Makefile index c3eb2f484..b4bea9906 100644 --- a/periodicstats/Makefile +++ b/periodicstats/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=periodicstats -PKG_VERSION:=1.5.14 +PKG_VERSION:=1.5.15 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git -PKG_SOURCE_VERSION:=72974d0e22a64b2cec51857c3f17dc239fec079f +PKG_SOURCE_VERSION:=5fcef8cbcd3ac396b59df0df0d50812cbfd35942 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif @@ -26,7 +26,7 @@ define Package/periodicstats SECTION:=utils CATEGORY:=Utilities TITLE:=Periodic Statistics Daemon - DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c + DEPENDS:=+ubus +libuci +libubox +libubus +libblobmsg-json DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service endef @@ -51,7 +51,6 @@ define Package/periodicstats/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME) - $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1) $(PKG_NAME) endef $(eval $(call BuildPackage,periodicstats)) diff --git a/periodicstats/bbfdm_service.json b/periodicstats/bbfdm_service.json index 99023aafd..ea2c1e3d6 100644 --- a/periodicstats/bbfdm_service.json +++ b/periodicstats/bbfdm_service.json @@ -2,7 +2,7 @@ "daemon": { "enable": "1", "service_name": "periodicstats", - "unified_daemon": false, + "unified_daemon": true, "services": [ { "parent_dm": "Device.", diff --git a/periodicstats/files/etc/config/periodicstats b/periodicstats/files/etc/config/periodicstats index 574e34e63..f9f7bdffe 100644 --- a/periodicstats/files/etc/config/periodicstats +++ b/periodicstats/files/etc/config/periodicstats @@ -1,4 +1,3 @@ config globals 'globals' - option enable '1' - option base_interval '5' - + # log_level as per syslog i.e (0-7), default 6 (LOG_INFO) + option log_level '6' diff --git a/periodicstats/files/etc/init.d/periodicstats b/periodicstats/files/etc/init.d/periodicstats index ac79084d5..af17ef606 100755 --- a/periodicstats/files/etc/init.d/periodicstats +++ b/periodicstats/files/etc/init.d/periodicstats @@ -7,22 +7,25 @@ USE_PROCD=1 PROG="/usr/sbin/periodicstatsd" start_service() { - local enable - config_load periodicstats - config_get_bool enable globals enable 1 + config_get log_level globals log_level "6" - procd_open_instance periodicstatsd - if [ "${enable}" -eq "1" ]; then - procd_set_param command ${PROG} - procd_set_param respawn - fi - procd_close_instance + procd_open_instance "periodicstats" + procd_set_param command ${PROG} -l ${log_level} + procd_set_param respawn + procd_close_instance "periodicstats" } reload_service() { - stop - start + ret=$(ubus call service list '{"name":"periodicstats"}' | jsonfilter -qe '@.periodicstats.instances.periodicstats.running') + if [ "$ret" != "true" ]; then + stop + start + else + ubus send periodicstats.reload + fi + + return } service_triggers() {