diff --git a/config/lang/de.json b/config/lang/de.json index b3dd2dac549efcd480c39b668442391f4be01fc8..6776db8fe94659334796e08c491422c430565b09 100644 --- a/config/lang/de.json +++ b/config/lang/de.json @@ -131,7 +131,8 @@ "class-project-info-deploy-skip-sync": "SKIP: Synchronisationstyp "%s" wird (noch) nicht unterstützt.", "class-project-info-deploy-start-by-method": "Starte Installation auf Zielhosts", "class-project-info-deploy-start-by-method-skip": "SKIP: es gibt nichts zu tun. Wurde keine Installationsart und/ oder kein Ziel Host definiert.", - "class-project-info-deploy-successful": "Das Deployment wurde erfolgreich abgeschlossen.", + "class-project-info-deploy-successful": "Das Deployment der Phase %s wurde erfolgreich abgeschlossen.", + "class-project-info-deploy-failed": "Das Deployment der Phase %s enthält Fehler.", "class-project-info-accept-overview": "Info: in der Phase "%s" ist installiert:", "class-project-info-accept-version-and-next-phase": "Die aktuelle Version [%s] wird nun in die Queue der Phase [%s] gestellt.", "class-project-info-setup-phaseinfos": "Aktiviere die Phasen des Projektes und gib die URLs der jeweiligen Applikationen an.<br>Der Sysadmin muss zudem die einzelnen Hosts in Puppet konfigurieren - bitte neu zuverwendende Server mit ihm abstimmen.", diff --git a/config/lang/en.json b/config/lang/en.json index 50786dcdf6dac5b1cd520caa090caee0bac65942..fce023ffbcf49c771e6af32d775ed5e64d608157 100644 --- a/config/lang/en.json +++ b/config/lang/en.json @@ -133,6 +133,7 @@ "class-project-info-deploy-start-by-method": "Starting installation to target hosts", "class-project-info-deploy-start-by-method-skip": "SKIP: nothing to do. No method an/ or target host were defined.", "class-project-info-deploy-successful": "The deployment was finished successfully.", + "class-project-info-deploy-failed": "The deployment failed.", "class-project-info-accept-overview": "Info: in the phase "%s" is installed:", "class-project-info-accept-version-and-next-phase": "The current version [%s] will be put to the queue of phase [%s].", "class-project-info-setup-phaseinfos": "Activate the needed phases for your project. Enter the urls of each phase.<br>Fore new hosts: contact the system administrator - he must configure the hosts before the project can be installed there.", diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php index 37d301119b5d407dd6acb499cd0b0eff73621a81..954fade36f5ed727aac656d48af84393f8f29ca2 100644 --- a/public_html/deployment/classes/project.class.php +++ b/public_html/deployment/classes/project.class.php @@ -2191,12 +2191,7 @@ class project extends base { $sReturn.=t("class-project-info-deploy-start-by-method-skip") . "<br>"; } else { - $sReturn.='<p>' - . 'Plugin: '.$this->oRolloutPlugin->getId().'<br>' - . '</p>' - . '<pre>Config for phase '.$sPhase.' = '.print_r($this->oRolloutPlugin->getConfig($sPhase), 1).'</pre>' - . '<pre>Commands = '.print_r($this->oRolloutPlugin->getDeployCommands($sPhase), 1).'</pre>' - ; + $sReturn.='<p>' . 'Plugin: '.$this->oRolloutPlugin->getId().'</p>'; foreach($this->oRolloutPlugin->getDeployCommands($sPhase) as $sCmd){ $sReturn.=$this->_execAndSend("$sCmd"); @@ -2234,10 +2229,18 @@ class project extends base { $this->_TempFill($sReturn, $aActionList); $sReturn.="<br>"; - $sReturn.=$this->_oHtml->getBox("success", t("class-project-info-deploy-successful")); - $this->_sendMessage(t("class-project-info-deploy-successful")."\nphase: ${sPhase}\n"); - $this->_logaction(t('finished') . " deploy($sPhase, $bIgnoreDeploytimes) " . t("class-project-info-deploy-successful"), __FUNCTION__, "success"); + if (!$this->_iRcAll == 0) { + $sWarnlevel='error'; + $sMessage = sprintf(t('class-project-info-deploy-failed'), $sPhase); + } else { + $sWarnlevel='success'; + $sMessage=sprintf(t("class-project-info-deploy-successful"), $sPhase); + } + $sReturn.=$this->_oHtml->getBox($sWarnlevel, $sMessage); + $this->_sendMessage($sMessage); + $this->_logaction(t('finished') . " deploy($sPhase, $bIgnoreDeploytimes) " . $sMessage, __FUNCTION__, $sWarnlevel); + $this->_TempDelete(); return $sReturn; }