composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

CRON: report that CRON is already running BEFORE saying that the DB is read-only (re-entrance during an operation done in the background)

Browse Source 
SVN:trunk[2837]
This commit is contained in:
Romain Quetiez
2013-08-27 14:20:12 +00:00
parent 73b492e892
commit 564ba105eb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
webservices/cron.php
View File

@@ -310,14 +310,6 @@ if (!UserRights::IsAdministrator())
exit -1;
}
if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
{
$oP->p("A database maintenance is ongoing (read-only mode even for admins).");
$oP->Output();
exit -1;
}
// Enumerate classes implementing BackgroundProcess
//
$aProcesses = array();
@@ -365,6 +357,15 @@ try
$oMutex = new iTopMutex('cron.'.$oConfig->GetDBName().'_'.$oConfig->GetDBSubname());
if ($oMutex->TryLock())
{
// Note: testing this now in case some of the background processes forces the read-only mode for a while
// in that case it is better to exit with the check on reentrance (mutex)
if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
{
$oP->p("A database maintenance is ongoing (read-only mode even for admins).");
$oP->Output();
exit -1;
}
CronExec($oP, $aProcesses, $bVerbose);
$oMutex->Unlock();