mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-03-14 21:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix return from default config

Browse source
This commit is contained in:
Vivek Kumar Dutta 2023-11-24 22:00:43 +05:30
parent e9c216f497
commit 1f9a6b0e06
No known key found for this signature in database
GPG key ID: 65C818099F37097D
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bbfdmd/ubus/CMakeLists.txt
View file

@ -21,4 +21,3 @@ FILE(GLOB BBF_SOURCES *.c)
ADD_EXECUTABLE(bbfdmd ${BBF_SOURCES})
TARGET_LINK_LIBRARIES(bbfdmd ubus ubox blobmsg_json dl bbfdm-api)
INSTALL(TARGETS bbfdmd DESTINATION usr/sbin)
INSTALL(FILES ../../json/input.json DESTINATION tmp/bbfdm)

8
bbfdmd/ubus/bbfdmd.c
View file

@ -1353,12 +1353,14 @@ static int bbfdm_load_deamon_config(bbfdm_config_t *config, const char *json_pat
{
char *opt_val = NULL;
int err = 0;
json_object *json_obj = NULL;
if (!json_path || !strlen(json_path))
return -1;
json_object *json_obj = json_object_from_file(json_path);
json_obj = json_object_from_file(json_path);
if (!json_obj) {
ERR("Failed to read input %s file", json_path);
goto exit;
}
@ -1457,13 +1459,15 @@ static int bbfdm_load_deamon_config(bbfdm_config_t *config, const char *json_pat
snprintf(config->cli_out_type, sizeof(config->cli_out_type), "%s", opt_val);
}
json_object_put(json_obj);
return err;
exit:
if (json_obj) {
json_object_put(json_obj);
}
if (is_micro_service == false) {
ERR("Failed to read default input file, switching to defaults");
ERR("Switching to internal defaults");
config->transaction_timeout = 30;
config->refresh_time = BBF_INSTANCES_UPDATE_TIMEOUT;
config->subprocess_level = BBF_SUBPROCESS_DEPTH;

0
json/input.json → test/files/tmp/bbfdm/input.json
View file