mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "bulkdata: 2.1.1"

Browse source 
This reverts commit f0d7922c40.

It creates some issues when running cdr test. So we need to re-design how to run micro-service data model.
This commit is contained in:
Amin Ben Romdhane 2023-05-25 15:15:05 +02:00
parent a83ddcc563
commit b78d6684bf
3 changed files with 7 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bulkdata/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bulkdata
PKG_VERSION:=2.1.1
PKG_VERSION:=2.1.0
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)
@ -44,9 +44,8 @@ endif
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/bbfdm/services
$(INSTALL_DIR) $(1)/etc/bbfdm/services/bulkdata
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/services/bulkdata
$(INSTALL_DIR) $(1)/etc/bbfdm/json
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
$(CP) ./files/* $(1)/
endef

30
bulkdata/files/etc/bbfdm/services/bulkdata/input.json
View file

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

16
bulkdata/files/etc/init.d/bulkdatad
View file

@ -5,8 +5,6 @@ STOP=10
USE_PROCD=1
PROG="/usr/sbin/bulkdatad"
BBFDMD_PROG="/usr/sbin/bbfdmd"
BULKDATA_JSON_INPUT="/etc/bbfdm/services/bulkdata/input.json"
start_service() {
local enable
@ -14,18 +12,12 @@ start_service() {
config_load bulkdata
config_get_bool enable bulkdata enable 1
procd_open_instance "bbfdm.bulkdata"
procd_set_param command "$BBFDMD_PROG"
procd_append_param command -I "${BULKDATA_JSON_INPUT}"
procd_set_param respawn
procd_close_instance "bbfdm.bulkdata"
procd_open_instance bulkdata
[ "$enable" -eq "1" ] && {
procd_open_instance "bulkdata"
procd_set_param command "$PROG"
procd_set_param respawn
procd_close_instance "bulkdata"
}
procd_set_param respawn "3" "7" "0"
}
procd_close_instance
}
reload_service() {