Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Pierre Goiffon
2019-07-16 17:45:24 +02:00
3 changed files with 20 additions and 4 deletions

View File

@@ -161,7 +161,14 @@ class BackupExec implements iScheduledProcess
}
$sBackupFile = $this->sBackupDir.$sName;
$sSourceConfigFile = APPCONF.utils::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
$oBackup->CreateCompressedBackup($sBackupFile, $sSourceConfigFile);
try
{
$oBackup->CreateCompressedBackup($sBackupFile, $sSourceConfigFile);
}
catch (BackupException $e)
{
throw new ProcessFatalException($e->getMessage());
}
}
catch (Exception $e)
{