fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9530 HeartBeat IMPROVEMENT

Browse Source 
- HeartBeat not checked.
- HeartBeat works in skin classic and uxmodern.
This commit is contained in:
Marco Antonio Nina
2012-08-30 16:14:09 -04:00
parent 9bff534341
commit a5d7008329
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
workflow/engine/controllers/main.php
View File

@@ -193,39 +193,39 @@ class Main extends Controller
$availableLangArray = $this->getLanguagesList(); $availableLangArray = $this->getLanguagesList();
G::LoadClass ('serverConfiguration'); G::LoadClass ('serverConfiguration');
if (($nextBeatDate = $this->memcache->get('nextBeatDate')) === false) {
//get the serverconf singleton, and check if we can send the heartbeat
$oServerConf = & serverConf::getSingleton ();
$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION','HEART_BEAT_CONF');
$sflag = (trim($sflag)!='')? $sflag : '1';
//get date of next beat
$nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE','HEART_BEAT_CONF');
$this->memcache->set('nextBeatDate', $nextBeatDate, 1*3600);
}
$oServerConf = & serverConf::getSingleton (); if (($sflag == 1) && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
$sflag = (trim($sflag) != '') ? $sflag : '1';
//get date of next beat
$nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
//if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
if (($sflag == "1") && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
//To do: we need to change to ExtJs //To do: we need to change to ExtJs
$this->setJSVar('flagHeartBeat', 1); $this->setJSVar('flagHeartBeat', 1);
} else { } else {
$this->setJSVar('flagHeartBeat', 0); $this->setJSVar('flagHeartBeat', 0);
} }
//check if we show the panel with the getting started info if (($flagGettingStarted = $this->memcache->get('flagGettingStarted')) === false) {
require_once 'classes/model/Configuration.php'; require_once 'classes/model/Configuration.php';
$oConfiguration = new Configuration (); $oConfiguration = new Configuration ();
$oCriteria = new Criteria ('workflow'); $oCriteria = new Criteria ('workflow');
$oCriteria->add (ConfigurationPeer::CFG_UID, 'getStarted'); $oCriteria->add (ConfigurationPeer::CFG_UID, 'getStarted');
$oCriteria->add (ConfigurationPeer::OBJ_UID, ''); $oCriteria->add (ConfigurationPeer::OBJ_UID, '');
$oCriteria->add (ConfigurationPeer::CFG_VALUE, '1'); $oCriteria->add (ConfigurationPeer::CFG_VALUE, '1');
$oCriteria->add (ConfigurationPeer::PRO_UID, ''); $oCriteria->add (ConfigurationPeer::PRO_UID, '');
$oCriteria->add (ConfigurationPeer::USR_UID, ''); $oCriteria->add (ConfigurationPeer::USR_UID, '');
$oCriteria->add (ConfigurationPeer::APP_UID, ''); $oCriteria->add (ConfigurationPeer::APP_UID, '');
$flagGettingStarted = ConfigurationPeer::doCount ($oCriteria); $flagGettingStarted = ConfigurationPeer::doCount ($oCriteria);
if ($flagGettingStarted == 0) { $this->memcache->set('flagGettingStarted', $flagGettingStarted, 8*3600) ;
$this->setJSVar('flagGettingStarted', 1);
} else {
$this->setJSVar('flagGettingStarted', 0);
} }
$this->setJSVar('flagGettingStarted', ($flagGettingStarted == 0));
G::loadClass('configuration'); G::loadClass('configuration');
$oConf = new Configurations; $oConf = new Configurations;
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS',''); $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');