From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 5 Aug 2008 15:47:17 +0000 (+0000)
Subject: More elaborate error messages on database init/connect.
X-Git-Tag: merge_316_6_after~10
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=caf08d8ee043805cba9323eed51ded6e8f695350;p=jra1mw.git

More elaborate error messages on database init/connect.
---

diff --git a/org.glite.jp.primary/src/new_ftp_backend.c b/org.glite.jp.primary/src/new_ftp_backend.c
index eafa06b..9ee40f8 100644
--- a/org.glite.jp.primary/src/new_ftp_backend.c
+++ b/org.glite.jp.primary/src/new_ftp_backend.c
@@ -234,13 +234,13 @@ int glite_jppsbe_init(
 	}
 
 	if (glite_lbu_InitDBContext(((glite_lbu_DBContext *)&ctx->dbhandle)) != 0) {
-		err.code = EINVAL;
-		err.desc = "Cannot init backend's database";
+		err.code = glite_jp_db_SetError(ctx, __FUNCTION__);
+		err.desc = "Cannot init backend's database (during init)";
 		return glite_jp_stack_error(ctx,&err);
 	}
 	if (glite_lbu_DBConnect(ctx->dbhandle, config->db_cs)) {
-		err.code = EIO;
-		err.desc = "Cannot access backend's database (during init)";
+		err.code = glite_jp_db_SetError(ctx, __FUNCTION__);
+		err.desc = "Cannot access backend's database (during connect)";
 		return glite_jp_stack_error(ctx,&err);
 	} else {
 		/* slaves open their own connections */
@@ -262,13 +262,13 @@ int glite_jppsbe_init_slave(
 	err.source = __FUNCTION__;
 	
 	if (glite_lbu_InitDBContext(((glite_lbu_DBContext *)&ctx->dbhandle)) != 0) {
-		err.code = EINVAL;
-		err.desc = "Cannot init backend's database";
+		err.code = glite_jp_db_SetError(ctx, __FUNCTION__);
+		err.desc = "Cannot init backend's database (during init)";
 		return glite_jp_stack_error(ctx,&err);
 	}
 	if (glite_lbu_DBConnect(ctx->dbhandle, config->db_cs)) {
-		err.code = EIO;
-		err.desc = "Cannot access backend's database";
+		err.code = glite_jp_db_SetError(ctx, __FUNCTION__);
+		err.desc = "Cannot access backend's database (during connect)";
 		return glite_jp_stack_error(ctx,&err);
 	}