diff --git a/README.md b/README.md index 5c18cb1b5bdc6015316c5748ba1f81e8a8b1d9e5..0df9f1dd466bacaf47772361c58affce7187161b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ bulkdatad is an implementation of The HTTP bulk data collection mechanism which The bulkdatad UCI configuration is located in **'/etc/config/bulkdata'**, and contains 4 sections: **bulkdata**, **profile**, **profile\_parameter** and **profile\_http\_request\_uri\_parameter**. ``` -config bulkdata 'globals' +config bulkdata 'bulkdata' option enable '0' #Log levels: Error=1, Warning=2, Info=3, Debug=4 option log_level '3' diff --git a/bbf_plugin/datamodel.c b/bbf_plugin/datamodel.c index c3d7289b52e9d7a65b0965bb796a740aa1d9cdb7..92f9c34c635e08c287f3f23c3ea21936892cffa7 100644 --- a/bbf_plugin/datamodel.c +++ b/bbf_plugin/datamodel.c @@ -288,10 +288,10 @@ static int delObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct d /************************************************************* * GET & SET PARAM *************************************************************/ -/*#Device.BulkData.Enable!UCI:bulkdata/bulkdata,globals/enable*/ +/*#Device.BulkData.Enable!UCI:bulkdata/bulkdata,bulkdata/enable*/ static int get_BulkData_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - *value = dmuci_get_option_value_fallback_def("bulkdata", "globals", "enable", "1"); + *value = dmuci_get_option_value_fallback_def("bulkdata", "bulkdata", "enable", "1"); return 0; } @@ -306,16 +306,16 @@ static int set_BulkData_Enable(char *refparam, struct dmctx *ctx, void *data, ch break; case VALUESET: string_to_bool(value, &b); - dmuci_set_value("bulkdata", "globals", "enable", b ? "1" : "0"); + dmuci_set_value("bulkdata", "bulkdata", "enable", b ? "1" : "0"); break; } return 0; } -/*#Device.BulkData.Status!UCI:bulkdata/bulkdata,globals/enable*/ +/*#Device.BulkData.Status!UCI:bulkdata/bulkdata,bulkdata/enable*/ static int get_BulkData_Status(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) { - dmuci_get_option_value_string("bulkdata", "globals", "enable", value); + dmuci_get_option_value_string("bulkdata", "bulkdata", "enable", value); if (strcmp(*value, "1") == 0) *value = "Enabled"; else diff --git a/src/config.c b/src/config.c index 4bcea72b6daad9d5cf36e5e35a82fa1177c1585e..d794d72ba808cc7b4a95049aed5a3f705f152511 100644 --- a/src/config.c +++ b/src/config.c @@ -22,7 +22,7 @@ static void set_log_level_config(void) { buci_init(); - char *loglevel = buci_get_value("bulkdata", "globals", "log_level"); + char *loglevel = buci_get_value("bulkdata", "bulkdata", "log_level"); uint8_t log_level = (loglevel && *loglevel) ? (uint8_t) strtoul(loglevel, NULL, 10) : DEFAULT_LOG_LEVEL; set_log_level(log_level); DEBUG("Log Level of Bulkdata is : %d", log_level);