Skip to content

Commit 5447a2c

Browse files
committed
addapt progress reporting in FileHistoryCache
1 parent 51f6cec commit 5447a2c

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,8 @@ public void store(History history, Repository repository, String tillRevision) t
471471
* (saved in the value of the hash map entry for the file) in a file.
472472
* The renamed files will be handled separately.
473473
*/
474-
LOGGER.log(Level.FINE, "Storing history for {0} regular files in repository ''{1}'' till {2}",
474+
Level logLevel = Level.FINE;
475+
LOGGER.log(logLevel, "Storing history for {0} regular files in repository ''{1}'' till {2}",
475476
new Object[]{regularFiles.size(), repository, getRevisionString(tillRevision)});
476477
final File root = env.getSourceRootFile();
477478

@@ -480,7 +481,7 @@ public void store(History history, Repository repository, String tillRevision) t
480481
try (Progress progress = new Progress(LOGGER,
481482
String.format("history cache for regular files of %s till %s", repository,
482483
getRevisionString(tillRevision)),
483-
regularFiles.size())) {
484+
regularFiles.size(), logLevel)) {
484485
for (String file : regularFiles) {
485486
env.getIndexerParallelizer().getHistoryFileExecutor().submit(() -> {
486487
try {
@@ -502,7 +503,7 @@ public void store(History history, Repository repository, String tillRevision) t
502503
} catch (InterruptedException ex) {
503504
LOGGER.log(Level.SEVERE, "latch exception", ex);
504505
}
505-
LOGGER.log(Level.FINE, "Stored history for {0} regular files in repository ''{1}''",
506+
LOGGER.log(logLevel, "Stored history for {0} regular files in repository ''{1}''",
506507
new Object[]{fileHistoryCount, repository});
507508
}
508509

@@ -530,7 +531,8 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
530531

531532
renamedFiles = renamedFiles.stream().filter(f -> new File(env.getSourceRootPath() + f).exists()).
532533
collect(Collectors.toSet());
533-
LOGGER.log(Level.FINE, "Storing history for {0} renamed files in repository ''{1}'' till {2}",
534+
Level logLevel = Level.FINE;
535+
LOGGER.log(logLevel, "Storing history for {0} renamed files in repository ''{1}'' till {2}",
534536
new Object[]{renamedFiles.size(), repository, getRevisionString(tillRevision)});
535537

536538
createDirectoriesForFiles(renamedFiles, repository, "renamed files for history " +
@@ -542,7 +544,7 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
542544
try (Progress progress = new Progress(LOGGER,
543545
String.format("history cache for renamed files of %s till %s", repository,
544546
getRevisionString(tillRevision)),
545-
renamedFiles.size())) {
547+
renamedFiles.size(), logLevel)) {
546548
for (final String file : renamedFiles) {
547549
env.getIndexerParallelizer().getHistoryFileExecutor().submit(() -> {
548550
try {
@@ -568,7 +570,7 @@ public void storeRenamed(Set<String> renamedFiles, Repository repository, String
568570
LOGGER.log(Level.SEVERE, "latch exception", ex);
569571
}
570572
}
571-
LOGGER.log(Level.FINE, "Stored history for {0} renamed files in repository {1}",
573+
LOGGER.log(logLevel, "Stored history for {0} renamed files in repository {1}",
572574
new Object[]{renamedFileHistoryCount.intValue(), repository});
573575
}
574576

0 commit comments

Comments
 (0)