obuspa: 7.0.4.7

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.4.6
+PKG_VERSION:=7.0.4.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=2232fde58e066d4edc1124be5fa67bc6c0fdea75
+PKG_SOURCE_VERSION:=1ff353ea704a2ffada5cf9dcc4bca09cc318225e
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspa/files/etc/config/obuspa

@@ -2,7 +2,7 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option dhcp_discovery '1'
-	option log_level '1'
+	option log_level '2'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
 	option role_file '/etc/obuspa/roles.json'

obuspa/files/etc/init.d/obuspa

@@ -1033,37 +1033,30 @@ db_init()
 	return 0;
 }
 
-register_service()
-{
-	procd_open_instance ${CONFIGURATION}
-	procd_set_param command ${PROG}
-
-	configure_obuspa
-	procd_set_param respawn \
-			"${respawn_threshold:-10}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-5}"
-
-	procd_set_param watch bbfdm
-	procd_close_instance
-}
-
 start_service() {
 	local enabled
 
+	mkdir -p /tmp/obuspa/
 	config_load obuspa
 	config_get_bool enabled global enabled 0
 
-	if [ "${enabled}" -eq 0 ]; then
-		return 0;
+	procd_open_instance ${CONFIGURATION}
+	if [ "${enabled}" -eq 1 ]; then
+		db_init "${1}"
+		procd_set_param command ${PROG}
+		configure_obuspa
+		procd_set_param respawn \
+			"${respawn_threshold:-10}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-5}"
+		#procd_set_param limits core="unlimited"
 	fi
-
-	mkdir -p /tmp/obuspa/
-	db_init "${1}"
-	register_service
+	procd_close_instance ${CONFIGURATION}
 }
 
 stop_service() {
-	${PROG} -c stop >/dev/null 2>&1
+	if command -v timeout >/dev/null 2>&1; then
+		timeout 5 ${PROG} -c stop
+	fi
 }
 
 reload_service() {

obuspa/files/etc/obuspa/roles.json

@@ -163,6 +163,7 @@
             "PERMIT_GET_INST",
             "PERMIT_OBJ_INFO",
             "PERMIT_CMD_INFO",
+            "PERMIT_SUBS_VAL_CHANGE",
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
@@ -283,6 +284,7 @@
             "PERMIT_GET_INST",
             "PERMIT_OBJ_INFO",
             "PERMIT_CMD_INFO",
+            "PERMIT_SUBS_VAL_CHANGE",
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },