zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge commit

Browse source
This commit is contained in:
robvde 2013-07-31 22:43:35 +04:00
commit 6cb0a713ce
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs
View file

@ -478,12 +478,11 @@ namespace WebsitePanel.Providers.Database
string cmd = Path.Combine(MySqlBinFolder, "mysqldump.exe"); string cmd = Path.Combine(MySqlBinFolder, "mysqldump.exe");
string bakFile = Path.Combine(BackupTempFolder, backupName); string bakFile = Path.Combine(BackupTempFolder, backupName);
string args = string.Format(" --host={0} --port={1} --user={2} --password={3} --opt --skip-extended-insert --skip-quick --skip-comments {4}", string args = string.Format(" --host={0} --port={1} --user={2} --password={3} --opt --skip-extended-insert --skip-quick --skip-comments --result-file=\"{4}\" {5}",
ServerName, ServerPort, ServerName, ServerPort, RootLogin, RootPassword, bakFile, databaseName);
RootLogin, RootPassword, databaseName);
// backup database // backup database
FileUtils.ExecuteSystemCommand(cmd, args, bakFile); FileUtils.ExecuteSystemCommand(cmd, args);
return bakFile; return bakFile;
} }

3
WebsitePanel/build.xml
View file

@ -309,6 +309,9 @@
</MSBuild> </MSBuild>
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/> <MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/>
<XmlUpdate XmlFileName="$(EnterpriseServerBuild)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/connectionStrings/add/@connectionString" Value="${installer.connectionstring}" />
<XmlUpdate XmlFileName="$(EnterpriseServerBuild)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/appSettings/add[@key=%22WebsitePanel.CryptoKey%22]/@value" Value="${installer.cryptokey}" />
<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.SchedulerService\Setup.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"> <MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.SchedulerService\Setup.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
<Output <Output