[Minor] logger fix in Migrations

This commit is contained in:
Robert von Burg 2017-10-12 16:13:59 +02:00
parent 394c3735e3
commit 7dd6aa8afc
1 changed files with 9 additions and 7 deletions

View File

@ -157,8 +157,9 @@ public class Migrations {
* @param cert * @param cert
* @param codeMigrationsByRealm * @param codeMigrationsByRealm
*/ */
public void runCodeMigrations(Certificate cert, Map<String, MigrationVersion> currentVersions, public void runCodeMigrations(Certificate cert,
MapOfLists<String, CodeMigration> codeMigrationsByRealm) { Map<String, MigrationVersion> currentVersions,
MapOfLists<String, CodeMigration> codeMigrationsByRealm) {
MapOfLists<String, Version> migrationsRan = new MapOfLists<>(); MapOfLists<String, Version> migrationsRan = new MapOfLists<>();
@ -197,15 +198,16 @@ public class Migrations {
if (this.verbose) if (this.verbose)
logger.info("There were no migrations required!"); logger.info("There were no migrations required!");
} else { } else {
logger.info("Migrated " + migrationsRan.size() + " realms!"); logger.info(
"Performed " + migrationsRan.size() + " migrations on " + migrationsRan.sizeKeys() + " realms.");
addOperationLogs(migrationsRan); addOperationLogs(migrationsRan);
} }
this.migrationsRan = migrationsRan; this.migrationsRan = migrationsRan;
} }
private static void logDetectedMigrations(Set<String> realmNames, private static void logDetectedMigrations(Set<String> realmNames,
Map<String, SortedSet<DataMigration>> allDataMigrations, Map<String, SortedSet<DataMigration>> allDataMigrations,
Map<String, SortedSet<CodeMigration>> allCodeMigrations) { Map<String, SortedSet<CodeMigration>> allCodeMigrations) {
for (String realm : realmNames) { for (String realm : realmNames) {
@ -232,7 +234,7 @@ public class Migrations {
} }
private static Map<String, SortedSet<DataMigration>> loadDataMigrations(Set<String> realmNames, private static Map<String, SortedSet<DataMigration>> loadDataMigrations(Set<String> realmNames,
File migrationsPath) { File migrationsPath) {
Map<String, SortedSet<DataMigration>> migrationsByRealm = new HashMap<>(); Map<String, SortedSet<DataMigration>> migrationsByRealm = new HashMap<>();
@ -264,7 +266,7 @@ public class Migrations {
} }
private static Map<String, SortedSet<CodeMigration>> loadCodeMigrations(Set<String> realmNames, private static Map<String, SortedSet<CodeMigration>> loadCodeMigrations(Set<String> realmNames,
File migrationsPath) { File migrationsPath) {
Map<String, SortedSet<CodeMigration>> migrationsByRealm = new HashMap<>(); //new TreeSet<>((o1, o2) -> o1.getVersion().compareTo(o2.getVersion())); Map<String, SortedSet<CodeMigration>> migrationsByRealm = new HashMap<>(); //new TreeSet<>((o1, o2) -> o1.getVersion().compareTo(o2.getVersion()));