diff options
author | irina <irinagomez@us.es> | 2017-07-28 08:50:53 +0000 |
---|---|---|
committer | irina <irinagomez@us.es> | 2017-07-28 08:50:53 +0000 |
commit | ce678a0f469019c10ebf7e7b1c1de496bed98dce (patch) | |
tree | ebc08b5e5e7a0bc81b75285a0521a49a8ebbd17d /client/shared | |
parent | 6934ad12ffcea46bbb1cda8278371b54ee51dce6 (diff) |
#781 deploy con multicast: Si timeout para error multicast es menor que tiempo de espera del servidor lo aumento. ogAdmRepoAux: Se corrige errata al llamar a sendMcastFile
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5413 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared')
-rwxr-xr-x | client/shared/scripts/restoreImage | 4 | ||||
-rwxr-xr-x | client/shared/scripts/updateCache | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/client/shared/scripts/restoreImage b/client/shared/scripts/restoreImage index 00f51f49..d9e7f584 100755 --- a/client/shared/scripts/restoreImage +++ b/client/shared/scripts/restoreImage @@ -48,6 +48,10 @@ PART="$4" PROTO="${5^^}" PROTO=${PROTO:-"UNICAST"} PROTOOPT="$6" +# Si MCASTWAIT menos que tiempo de espera del servidor lo aumento +if [ "${PROTO%-*}" == "MULTICAST" ] && [[ ${PROTOOPT##*:} =~ ^-?[0-9]+$ ]]; then + [ ${MCASTWAIT:-0} -lt ${PROTOOPT##*:} ] && let MCASTWAIT=${PROTOOPT##*:}+5 +fi IMGTYPE="${IMGTYPE:-"img"}" # Unidad organizativa diff --git a/client/shared/scripts/updateCache b/client/shared/scripts/updateCache index 5815f9cb..94049ced 100755 --- a/client/shared/scripts/updateCache +++ b/client/shared/scripts/updateCache @@ -54,6 +54,11 @@ echo " " > $OGLOGCOMMAND REPOSITORIO="${1^^}" PROTOCOLO="${3^^}" OPTPROTOCOLO="$4" +# Si MCASTWAIT menos que tiempo de espera del servidor lo aumento +if [ "${PROTOCOLO%-*}" == "MULTICAST" ] && [[ ${OPTPROTOCOLO##*:} =~ ^-?[0-9]+$ ]]; then + [ ${MCASTWAIT:0} -lt ${OPTPROTOCOLO##*:} ] && let MCASTWAIT=${OPTPROTOCOLO##*:}+5 +fi + # Unidad organizativa. [ "$ogunit" != "" ] && OGUNIT="$ogunit/" |