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

N°1173 : mysqldump now correctly use 'mysql_bindir' parameter on setup & move to prod's backups

Browse Source 
SVN:trunk[5767]
This commit is contained in:
Stephen Abello
2018-05-03 15:00:13 +00:00
parent b43063a6d2
commit cb2c172483
5 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/applicationinstaller.class.inc.php
View File

@@ -40,7 +40,8 @@ class ApplicationInstaller
const ERROR = 2;
const WARNING = 3;
const INFO = 4;
/** @var \PHPParameters */
protected $oParams;
protected static $bMetaModelStarted = false;
@@ -180,8 +181,8 @@ class ApplicationInstaller
$aDBParams = $this->GetParamValues($this->oParams);
$oTempConfig = new Config();
$oTempConfig->UpdateFromParams($aDBParams);
self::DoBackup($oTempConfig, $sDestination, $sSourceConfigFile);
$sMySQLBinDir = $this->oParams->Get('mysql_bindir', null);
self::DoBackup($oTempConfig, $sDestination, $sSourceConfigFile, $sMySQLBinDir);
$aResult = array(
'status' => self::OK,
@@ -428,10 +429,14 @@ class ApplicationInstaller
*
* @since 2.5 uses a {@link Config} object to store DB parameters
*/
protected static function DoBackup($oConfig, $sBackupFileFormat, $sSourceConfigFile)
protected static function DoBackup($oConfig, $sBackupFileFormat, $sSourceConfigFile, $sMySQLBinDir = null)
{
$oBackup = new SetupDBBackup($oConfig);
$sTargetFile = $oBackup->MakeName($sBackupFileFormat);
if (!empty($sMySQLBinDir))
{
$oBackup->SetMySQLBinDir($sMySQLBinDir);
}
$oBackup->CreateCompressedBackup($sTargetFile, $sSourceConfigFile);
}