#565 #636 revisión mensajes de error en las sincronizadas.

git-svn-id: https://opengnsys.es/svn/branches/version1.0@4173 a21b9725-9963-47de-94b9-378ad31fedc9

4 files changed, 30 insertions, 3 deletions

diff --git a/admin/Interface/CrearImagenBasica b/admin/Interface/CrearImagenBasica
index 7efc69e2..20607f9b 100755
--- a/admin/Interface/CrearImagenBasica
+++ b/admin/Interface/CrearImagenBasica
@@ -63,6 +63,7 @@
 	if [ $7 -eq 1 ]; then
 		#sincronizacion1 
 		ogCrearImagenBasica "$@"
+        	RETVAL=$?
 	fi		
 	
 
@@ -83,8 +84,16 @@
 		[ "$4" == "0.0.0.0" ] && DEST="CACHE" || DEST="REPO"
 
 		createBaseImage $1 $2 $DEST "$3" 
+        	RETVAL=$?
 
 	fi
 
 	[ "$REPO" == "REPO" -a "$boot" != "admin" ] && CambiarAcceso user
 
+	# Registro de fin de ejecución
+	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+
+
+
+	exit $RETVAL
+
diff --git a/admin/Interface/CrearSoftIncremental b/admin/Interface/CrearSoftIncremental
index ccf8d70f..69ee9801 100755
--- a/admin/Interface/CrearSoftIncremental
+++ b/admin/Interface/CrearSoftIncremental
@@ -62,6 +62,7 @@
 	if [ $8 -eq 1 ]; then
 		#sincronizacion1 
 		ogCrearSoftIncremental "$@"
+		RETVAL=$?
 	fi		
 	
 
@@ -82,7 +83,13 @@
 		CLIENTIP=$(ogGetIpAddress)
 		[ "$4" == "$CLIENTIP" ] && DEST=CACHE || DEST=REPO
 		createDiffImage $1 $2 $DEST "$3" "$5" 
+		RETVAL=$?
 
 	fi
 
 	[ "$REPO" == "REPO" -a "$boot" != "admin" ] && CambiarAcceso user
+
+	# Registro de fin de ejecución
+	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+
+	exit $RETVAL
diff --git a/admin/Interface/RestaurarImagenBasica b/admin/Interface/RestaurarImagenBasica
index be088cc5..73ddb0e2 100755
--- a/admin/Interface/RestaurarImagenBasica
+++ b/admin/Interface/RestaurarImagenBasica
@@ -47,7 +47,7 @@
 
         # Clear temporary file used as log track by httpdlog
         # Limpia los ficheros temporales usados como log de seguimiento para httpdlog
-        echo " " > $OGLOGSESSION; echo " " > $OGLOGCOMMAND
+        echo -n  "" > $OGLOGSESSION; echo " " > $OGLOGCOMMAND
 
 	# Registro de inicio de ejecución
 	echo "$MSG_INTERFACE_START $0 $*" | tee -a $OGLOGSESSION $OGLOGFILE
@@ -55,6 +55,7 @@
 	if [ $9 -eq 1 ]; then
 		#sincronizacion1 
  		ogRestaurarImagenBasica "$@"
+		RETVAL=$?
 	fi			
 
 	if [ $9 -eq 2 ]; then
@@ -79,5 +80,10 @@
 		OPT=${5#*_}
 
 		restoreBaseImage $DEST "$3" $1 $2  $PROTO $OPT
-
+		RETVAL=$?
 	fi
+
+	# Registro de fin de ejecución
+	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+
+	exit $RETVAL
diff --git a/admin/Interface/RestaurarSoftIncremental b/admin/Interface/RestaurarSoftIncremental
index f889547b..2774dabc 100755
--- a/admin/Interface/RestaurarSoftIncremental
+++ b/admin/Interface/RestaurarSoftIncremental
@@ -48,6 +48,7 @@
 	if [ ${10} -eq 1 ]; then
 		#sincronizacion1 
  		ogRestaurarSoftIncremental "$@"
+		RETVAL=$?
 	fi			
 
 	if [ ${10} -eq 2 ]; then
@@ -72,6 +73,10 @@
                 OPT=${6#*_}
 
 		restoreDiffImage $DEST "$3" "$5" $1 $2  $PROTO $OPT
-
+		RETVAL=$?
 	fi
 
+	# Registro de fin de ejecución
+	echo "$MSG_INTERFACE_END $RETVAL" | tee -a $OGLOGSESSION $OGLOGFILE
+
+	exit $RETVAL