From 45af6700f547f8c2df2ef89a1deb9768f24bb7ca Mon Sep 17 00:00:00 2001 From: Vivek Kumar Dutta Date: Mon, 2 Sep 2024 19:10:12 +0530 Subject: [PATCH] bbfdm: respawn microservices --- bbfdm/Makefile | 2 +- bbfdm/files/etc/config/bbfdm | 1 - bbfdm/files/etc/init.d/bbfdm.services | 14 +++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/bbfdm/Makefile b/bbfdm/Makefile index 720d0f2b9..06a068ce6 100644 --- a/bbfdm/Makefile +++ b/bbfdm/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bbfdm -PKG_VERSION:=1.11.1 +PKG_VERSION:=1.11.2 USE_LOCAL:=0 ifneq ($(USE_LOCAL),1) diff --git a/bbfdm/files/etc/config/bbfdm b/bbfdm/files/etc/config/bbfdm index 0e75025df..6d4f83712 100644 --- a/bbfdm/files/etc/config/bbfdm +++ b/bbfdm/files/etc/config/bbfdm @@ -6,4 +6,3 @@ config bbfdmd 'bbfdmd' config micro_services 'micro_services' option enable '1' option enable_core '0' - option enable_respawn '1' diff --git a/bbfdm/files/etc/init.d/bbfdm.services b/bbfdm/files/etc/init.d/bbfdm.services index 9a3a2da44..2c27f2729 100644 --- a/bbfdm/files/etc/init.d/bbfdm.services +++ b/bbfdm/files/etc/init.d/bbfdm.services @@ -18,18 +18,16 @@ validate_bbfdm_micro_service_section() { uci_validate_section bbfdm micro_services "micro_services" \ 'enable:bool:true' \ - 'enable_core:bool:false' \ - 'enable_respawn:bool:true' + 'enable_core:bool:false' } _add_microservice() { local name path - local enable enable_core enable_respawn + local enable enable_core # Check enable from micro-service path="${1}" - enable_respawn="${2}" enable_core="${3}" name="$(basename ${path})" @@ -52,9 +50,7 @@ _add_microservice() procd_set_param stderr 1 fi - if [ "${enable_respawn}" -eq "1" ]; then - procd_set_param respawn "3600" "5" "5" - fi + procd_set_param respawn procd_close_instance "${name}" } @@ -77,7 +73,7 @@ configure_bbfdm_micro_services() do [ -e "$file" ] || continue - _add_microservice $file "${enable_respawn}" "${enable_core}" + _add_microservice $file "${enable_core}" done fi } @@ -92,7 +88,7 @@ _start_single_service() file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)" [ -e "$file" ] || return - _add_microservice $file "0" "0" + _add_microservice $file "0" fi }