haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3621 from warwickmm/dispose_connection

Browse Source 
Dispose of Connection after use
This commit is contained in:
Rune Henriksen
2019-01-25 23:32:42 +01:00
committed by GitHub
parent 26d36a53a2 c79fbf5265
commit c1b0611e90
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/WebServer/RESTMethods/Backups.cs
+13 -12
View File
@@ -127,21 +127,22 @@ namespace Duplicati.Server.WebServer.RESTMethods
Serializable.ImportExportStructure importedStructure = Backups.LoadConfiguration(configurationFile, importMetadata, getPassword);
// This will create the Duplicati-server.sqlite database file if it doesn't exist.
Duplicati.Server.Database.Connection connection = Program.GetDatabaseConnection(advancedOptions);
if (connection.Backups.Any(x => x.Name.Equals(importedStructure.Backup.Name, StringComparison.OrdinalIgnoreCase)))
using (Duplicati.Server.Database.Connection connection = Program.GetDatabaseConnection(advancedOptions))
{
throw new InvalidOperationException($"A backup with the name {importedStructure.Backup.Name} already exists.");
}
if (connection.Backups.Any(x => x.Name.Equals(importedStructure.Backup.Name, StringComparison.OrdinalIgnoreCase)))
{
throw new InvalidOperationException($"A backup with the name {importedStructure.Backup.Name} already exists.");
}
string error = connection.ValidateBackup(importedStructure.Backup, importedStructure.Schedule);
if (!string.IsNullOrWhiteSpace(error))
{
throw new InvalidOperationException(error);
}
string error = connection.ValidateBackup(importedStructure.Backup, importedStructure.Schedule);
if (!string.IsNullOrWhiteSpace(error))
{
throw new InvalidOperationException(error);
}
// This creates a new ID and DBPath.
connection.AddOrUpdateBackupAndSchedule(importedStructure.Backup, importedStructure.Schedule);
// This creates a new ID and DBPath.
connection.AddOrUpdateBackupAndSchedule(importedStructure.Backup, importedStructure.Schedule);
}
return importedStructure;
}