improve logging for repository invalidation

Author: vladak

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

@@ -965,8 +965,7 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, C
             return;
         }
 
-        Map<String, Repository> newrepos =
-            Collections.synchronizedMap(new HashMap<>(repos.size()));
+        Map<String, Repository> repositoryMap = Collections.synchronizedMap(new HashMap<>(repos.size()));
         Statistics elapsed = new Statistics();
 
         LOGGER.log(Level.FINE, "invalidating {0} repositories", repos.size());
@@ -991,21 +990,21 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, C
                     return thread;
                 });
 
-        for (RepositoryInfo rinfo : repos) {
+        for (RepositoryInfo repositoryInfo : repos) {
             executor.submit(() -> {
                 try {
-                    Repository r = RepositoryFactory.getRepository(rinfo, cmdType);
+                    Repository r = RepositoryFactory.getRepository(repositoryInfo, cmdType);
                     if (r == null) {
                         LOGGER.log(Level.WARNING,
-                                "Failed to instantiate internal repository data for {0} in {1}",
-                                new Object[]{rinfo.getType(), rinfo.getDirectoryName()});
+                                "Failed to instantiate internal repository data for {0} in ''{1}''",
+                                new Object[]{repositoryInfo.getType(), repositoryInfo.getDirectoryName()});
                     } else {
-                        newrepos.put(r.getDirectoryName(), r);
+                        repositoryMap.put(r.getDirectoryName(), r);
                     }
                 } catch (Exception ex) {
                     // We want to catch any exception since we are in thread.
-                    LOGGER.log(Level.WARNING, "Could not create " + rinfo.getType()
-                        + " for '" + rinfo.getDirectoryName(), ex);
+                    LOGGER.log(Level.WARNING, "Could not create " + repositoryInfo.getType()
+                        + " repository object for '" + repositoryInfo.getDirectoryName() + "'", ex);
                 } finally {
                     latch.countDown();
                 }
@@ -1021,9 +1020,11 @@ public void invalidateRepositories(Collection<? extends RepositoryInfo> repos, C
         executor.shutdown();
 
         clear();
-        newrepos.forEach((_key, repo) -> putRepository(repo));
+        repositoryMap.forEach((key, repo) -> putRepository(repo));
 
-        elapsed.report(LOGGER, String.format("Done invalidating %d repositories", newrepos.size()),
+        elapsed.report(LOGGER, String.format("Done invalidating repositories (%d valid, %d working)",
+                        repositoryMap.size(), repositoryMap.values().stream().
+                                filter(RepositoryInfo::isWorking).collect(Collectors.toSet()).size()),
                 "history.repositories.invalidate");
     }
 

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

@@ -188,6 +188,7 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
 
             if ((!isNested || referenceRepo.isNestable()) && isEnabled(clazz) &&
                     referenceRepo.isRepositoryFor(file, cmdType)) {
+
                 repo = clazz.getDeclaredConstructor().newInstance();
 
                 if (env.isProjectsEnabled() && relFile.equals(File.separator)) {
@@ -200,8 +201,7 @@ public static Repository getRepository(File file, CommandTimeoutType cmdType, bo
                 repo.setDirectoryName(file);
 
                 if (!repo.isWorking()) {
-                    LOGGER.log(Level.WARNING,
-                            "{0} not working (missing binaries?): {1}",
+                    LOGGER.log(Level.WARNING, "{0} not working (missing binaries?): {1}",
                             new Object[]{
                                 repo.getClass().getSimpleName(),
                                 file.getPath()