Merge branch 'master' into dry_run

This commit is contained in:
niknah
2017-09-11 20:12:09 +10:00
committed by GitHub
7 changed files with 194 additions and 43 deletions

View File

@@ -1022,12 +1022,17 @@ func copySnapshots(context *cli.Context) {
os.Exit(ArgumentExitCode)
}
threads := context.Int("threads")
if threads < 1 {
threads = 1
}
repository, source := getRepositoryPreference(context, context.String("from"))
runScript(context, source.Name, "pre")
duplicacy.LOG_INFO("STORAGE_SET", "Source storage set to %s", source.StorageURL)
sourceStorage := duplicacy.CreateStorage(*source, false, 1)
sourceStorage := duplicacy.CreateStorage(*source, false, threads)
if sourceStorage == nil {
return
}
@@ -1057,7 +1062,7 @@ func copySnapshots(context *cli.Context) {
duplicacy.LOG_INFO("STORAGE_SET", "Destination storage set to %s", destination.StorageURL)
destinationStorage := duplicacy.CreateStorage(*destination, false, 1)
destinationStorage := duplicacy.CreateStorage(*destination, false, threads)
if destinationStorage == nil {
return
}
@@ -1082,11 +1087,6 @@ func copySnapshots(context *cli.Context) {
snapshotID = context.String("id")
}
threads := context.Int("threads")
if threads < 1 {
threads = 1
}
sourceManager.CopySnapshots(destinationManager, snapshotID, revisions, threads)
runScript(context, source.Name, "post")
}