Skip to content
Snippets Groups Projects

AWX - handling leerer AWX felder

Merged Hahn Axel (hahn) requested to merge rollout-plugins into master
1 file
+ 12
0
Compare changes
  • Side-by-side
  • Inline
@@ -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;
}
@@ -3958,12 +3961,24 @@ class project extends base {
// --------------------------------------------------
// Tab for raw data
// --------------------------------------------------
$sRolloutDebug='<hr>DEBUG:<br>';
foreach (array_keys($this->getPhases()) as $sPhase) {
if ($this->isActivePhase($sPhase)){
$sRolloutDebug.='<strong>'.$sPhase.'</strong>'
. '<pre>Config = '.print_r($this->oRolloutPlugin->getConfig($sPhase), 1).'</pre>'
. '<pre>Commands = '.print_r($this->oRolloutPlugin->getDeployCommands($sPhase), 1).'</pre>'
;
}
}
$aForms["setup"]["form"]['input' . $i++] = array(
'type' => 'markup',
'value' => '</div>'
. '<div class="tab-pane" id="tab6">'
. '<br><pre>'.print_r($this->_aPrjConfig, 1).'</pre>'
. $sRolloutDebug
. '</div>'
. '</div>'
Loading