Ver Fonte

Z991239-385 #comment root.ini加载流程添加加载错误时的定位信息

gifur há 5 anos atrás
pai
commit
cad8584742
1 ficheiros alterados com 35 adições e 10 exclusões
  1. 35 10
      spbase/sp_cfg.cpp

+ 35 - 10
spbase/sp_cfg.cpp

@@ -277,30 +277,47 @@ static int read_terminal(const char *file, sp_cfg_root_ini_t *root, int shm)
 {
 	int rc;
 	rc = read_ini_str(file, "Terminal", "TerminalNo", &root->terminal_no, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read TerminalNo failed!");
 		return rc;
+	}
+		
 	rc = read_ini_str(file, "Terminal", "MachineType", &root->machine_type, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read MachineType failed!");
 		return rc;
+	}
 	rc = read_ini_str(file, "Terminal", "MachineModel", &root->machine_model, shm);
+	if (rc != 0) {
+		sp_dbg_warn("read MachineModel failed!");
+	}
 	rc = read_ini_version(file, "Terminal", "MachineVersion", 
 		&root->machine_version.major, &root->machine_version.minor, NULL, NULL);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read MachineVersion failed!");
 		return rc;
+	}
 	rc = read_ini_str(file, "Terminal", "Site", &root->site, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read Site failed!");
 		return rc;
+	}
 	root->screen = inifile_read_int(file, "Terminal", "Screen", -1);
 	if (root->screen == -1) {
 		rc = -1;
+		sp_dbg_warn("read Screen failed!");
 		return rc;
 	}
 	rc = read_ini_position(file, "Terminal", "EnrolGPS", &root->enroll_gps_x, &root->enroll_gps_y, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read EnrolGPS failed!");
 		return rc;
+	}
 	rc = read_ini_str(file, "Terminal", "EnrolAddr", &root->enroll_address, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read EnrolAddr failed!");
 		return rc;
+	}
 
 	return rc;
 }
@@ -313,8 +330,10 @@ static int read_path(const char *file, sp_cfg_root_ini_t *root, int shm)
 	int i;
 
 	arr_kvp = inifile_read_section_key_all(file, "Path");
-	if (!arr_kvp)
+	if (!arr_kvp) {
+		sp_dbg_warn("read Path failed!");
 		return Error_NotExist;
+	}
 
 	root->arr_path = T_ARRAY_MAKE(arr_kvp->nelts, sizeof(sp_cfg_path_t*), shm);
 
@@ -322,8 +341,10 @@ static int read_path(const char *file, sp_cfg_root_ini_t *root, int shm)
 		sp_cfg_path_t *path = T_MALLOC_T(sp_cfg_path_t, shm);
 		path->name = T_STRDUP(pos, shm);
 		rc = read_ini_path(file, "Path", pos, &path->path, shm);
-		if (rc != 0)
+		if (rc != 0) {
+			sp_dbg_warn("read Path::%s failed!", pos);
 			return rc;
+		}
 		if (shm) {
 			SHM_ARRAY_PUSH(root->arr_path, sp_cfg_path_t*) = path;
 		} else {
@@ -398,10 +419,14 @@ static int load_root_ini(sp_dir_t *dir, sp_cfg_root_ini_t *root, const char *fil
 	int rc;
 
 	rc = read_terminal(file, root, shm);
-	if (rc != 0)
+	if (rc != 0) {
+		sp_dbg_warn("read terminal section failed!");
 		return rc;
+	}
 	rc = read_path(file, root, shm);
-
+	if (rc != 0) {
+		sp_dbg_warn("read path section failed!");
+	}
 	return rc;
 }