composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°1190 - Better error reporting and disk cleanup.

Browse Source 
SVN:trunk[5145]
This commit is contained in:
Eric Espié
2017-11-30 08:58:58 +00:00
parent 6477e2e1bb
commit c08edc207c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-backup/ajax.backup.php
View File

@@ -61,6 +61,7 @@ try
catch (Exception $e)
{
$oPage->p('Error: '.$e->getMessage());
IssueLog::Error($sOperation.' - '.$e->getMessage());
}
}
$oPage->output();
@@ -156,6 +157,7 @@ EOF
{
$oRestoreMutex->Unlock();
$oPage->p('Error: '.$e->getMessage());
IssueLog::Error($sOperation.' - '.$e->getMessage());
}
}
$oPage->output();
@@ -179,6 +181,6 @@ EOF
}
catch (Exception $e)
{
IssueLog::Error($e->getMessage());
IssueLog::Error($sOperation.' - '.$e->getMessage());
}

2
datamodels/2.x/itop-backup/dbrestore.class.inc.php
View File

@@ -131,7 +131,7 @@ class DBRestore extends DBBackup
$oArchive->extractFileTo($sDataDir, 'itop-dump.sql');
$sDataFile = $sDataDir.'/itop-dump.sql';
$this->LoadDatabase($sDataFile);
unlink($sDataFile);
SetupUtils::rrmdir($sDataDir);
// Update the code
//