summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authoririna <irinagomez@us.es>2017-05-18 09:51:47 +0000
committeririna <irinagomez@us.es>2017-05-18 09:51:47 +0000
commitadbfa2a39d3401395039a22d1f82aa62e5fb9da0 (patch)
treed2f8cf77743b1e7bac5091b8591f69b37613ab17 /client
parent924624be30586b8d75a0c0a94d095638958ae9b6 (diff)
#652 restoreImage y createImage: No borran mensajes de script personalizados en log en tiempo real
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5305 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
-rwxr-xr-xclient/shared/scripts/createImage5
-rwxr-xr-xclient/shared/scripts/restoreImage2
2 files changed, 5 insertions, 2 deletions
diff --git a/client/shared/scripts/createImage b/client/shared/scripts/createImage
index b813dc37..8abb34d4 100755
--- a/client/shared/scripts/createImage
+++ b/client/shared/scripts/createImage
@@ -68,7 +68,10 @@ REPO="${3^^}"
# 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 " " > ${OGLOGCOMMAND}.tmp
+# salvo si es llamado desde createImageCustom
+if [ "$(ogGetCaller)" != "createImageCustom" ]; then
+ echo " " > $OGLOGSESSION; echo " " > $OGLOGCOMMAND; echo " " > ${OGLOGCOMMAND}.tmp
+fi
ogEcho log session "[1] $MSG_SCRIPTS_START $0 $*"
diff --git a/client/shared/scripts/restoreImage b/client/shared/scripts/restoreImage
index c73f1810..fda3921e 100755
--- a/client/shared/scripts/restoreImage
+++ b/client/shared/scripts/restoreImage
@@ -36,7 +36,7 @@ fi
# Clear temporary file used as log track by httpdlog
# Limpia los ficheros temporales usados como log de seguimiento para httpdlog
echo " " > $OGLOGCOMMAND
-[ "$(ogGetCaller)" == "deployImage" ] || echo -n "" > $OGLOGSESSION;
+ogCheckStringInGroup "$(ogGetCaller)" "deployImage restoreImageCustom" || echo -n "" > $OGLOGSESSION;
ogEcho log session "[1] $MSG_SCRIPTS_START $0 $*"