X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FDeviceConfig.cc;h=f94637cca7ab5b3e716a7d33eebfec2426cbaa0d;hb=6dea0b59503a71874c4476c05044fff3c5ae26a5;hp=19cfbb9ab7c848cd3188faf8e3d40d86c1f4a037;hpb=c4d8504b99fa1e354d15b2b91e4e2797f54ba028;p=lib1wire.git

diff --git a/src/DeviceConfig.cc b/src/DeviceConfig.cc
index 19cfbb9..f94637c 100644
--- a/src/DeviceConfig.cc
+++ b/src/DeviceConfig.cc
@@ -97,11 +97,11 @@ string DeviceConfig::get_cfg_value(string key) {
 			option	= uci_lookup_option(uci_handle->ctx, section, key.c_str());
 			switch (option->type) {
 				case UCI_TYPE_STRING:
-					log_info("config file: key: %s option name: %s, value: %s\n", key.c_str(), option->e.name, option->v.string);
+					log_info("key: %s option name: %s, value: %s\n", key.c_str(), option->e.name, option->v.string);
 					ret_val	= option->v.string;
 					break;
 				default:
-					log_error("config file: key: %s can not parse parameter value\n", key.c_str());
+					log_error("key: %s Failed to read parameter value\n", key.c_str());
 					break;
 			}
 		}
@@ -155,15 +155,14 @@ ConfigHandle *DeviceConfig::load_device_config(string device_id_param) {
 			log_debug("uci_set_confdir: %s\n", cfg_dir.c_str());
 			uci_set_confdir(ctx, cfg_dir.c_str());
 			if (access(cfg_fl.c_str(), R_OK) == 0) {
-				log_debug("loading file: %s\n", cfg_fl.c_str());
 				err_flg	= uci_load(ctx, cfg_fl.c_str(), &pkg);
 				if (err_flg == UCI_OK) {
-					log_debug("Loaded device configuration: %s, UCI_OK: %d, err flg: %d\n.", cfg_fl.c_str(), UCI_OK, err_flg);
+					log_debug("Loaded device configuration file: %s\n.", cfg_fl.c_str());
 					ret_val	= new ConfigHandle(ctx, pkg);
 				}
 				else {
-					log_debug("Failed to load file: %s, UCI_OK: %d, err flg: %d\n.", cfg_fl.c_str(), UCI_OK, err_flg);
-					set_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE, "unknowntype");
+					log_debug("Failed to load file: %s, err code: %d\n.", cfg_fl.c_str(), UCI_OK);
+					set_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE, "");
 				}
 			}
 			else {