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

#1165 backup with errors fills up tmp-directories with lots of backup-files

Browse Source 
SVN:2.2.0[3869]
This commit is contained in:
Romain Quetiez
2016-01-21 15:07:58 +00:00
parent 4097a7c74d
commit 49c5fda280
2 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
setup/backup.class.inc.php
View File

@@ -1,5 +1,5 @@
<?php
// Copyright (C) 2010-2012 Combodo SARL
// Copyright (C) 2010-2016 Combodo SARL
//
// This file is part of iTop.
//
@@ -296,6 +296,13 @@ class DBBackup
}
if ($iRetCode != 0)
{
// Cleanup residual output (Happens with Error 2020: Got packet bigger than 'maxallowedpacket' bytes...)
if (file_exists($sBackupFileName))
{
unlink($sBackupFileName);
throw new Exception('Effacement du fichier '.$sTmpFileName);
}
$this->LogError("Failed to execute: $sCommandDisplay. The command returned:$iRetCode");
foreach($aOutput as $sLine)
{

18
webservices/cron.php
View File

@@ -1,5 +1,5 @@
<?php
// Copyright (C) 2010-2013 Combodo SARL
// Copyright (C) 2010-2016 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,7 +19,7 @@
/**
* Heart beat of the application (process asynchron tasks such as broadcasting email)
*
* @copyright Copyright (C) 2010-2013 Combodo SARL
* @copyright Copyright (C) 2010-2016 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
@@ -71,11 +71,16 @@ function UsageAndExit($oP)
function RunTask($oProcess, BackgroundTask $oTask, $oStartDate, $iTimeLimit)
{
try
{
$oNow = new DateTime();
$fStart = microtime(true);
try
{
$sMessage = $oProcess->Process($iTimeLimit);
}
catch(Exception $e)
{
$sMessage = 'Processing failed with message: '.$e->getMessage();
}
$fDuration = microtime(true) - $fStart;
if ($oTask->Get('total_exec_count') == 0)
{
@@ -108,11 +113,6 @@ function RunTask($oProcess, BackgroundTask $oTask, $oStartDate, $iTimeLimit)
$oTask->Set('next_run_date', $oPlannedStart->format('Y-m-d H:i:s'));
$oTask->DBUpdate();
}
catch(Exception $e)
{
$sMessage = 'Processing failed, the following exception occured: '.$e->getMessage();
}
return $sMessage;
}