From d5fce09e7b443de6317ada7a98b9e470bc0343f7 Mon Sep 17 00:00:00 2001 From: saledouble Date: Fri, 15 Nov 2019 10:47:35 -0500 Subject: [PATCH 1/3] Rejuvenate log levels --- .../java/org/opengrok/indexer/analysis/Ctags.java | 2 +- .../indexer/authorization/AuthorizationStack.java | 2 +- .../indexer/configuration/RuntimeEnvironment.java | 2 +- .../indexer/framework/PluginClassLoader.java | 2 +- .../opengrok/indexer/framework/PluginFramework.java | 2 +- .../opengrok/indexer/history/AccuRevRepository.java | 2 +- .../opengrok/indexer/history/FileHistoryCache.java | 6 +++--- .../indexer/index/DefaultIndexChangedListener.java | 4 ++-- .../org/opengrok/indexer/index/IndexDatabase.java | 4 ++-- .../org/opengrok/indexer/index/IndexVersion.java | 8 ++++---- .../java/org/opengrok/indexer/index/Indexer.java | 12 ++++++------ .../java/org/opengrok/indexer/util/CtagsUtil.java | 2 +- .../java/org/opengrok/indexer/util/Executor.java | 2 +- .../web/api/v1/controller/ProjectsController.java | 4 ++-- .../provider/service/impl/SuggesterServiceImpl.java | 4 ++-- .../java/opengrok/auth/plugin/LdapAttrPlugin.java | 2 +- .../java/opengrok/auth/plugin/LdapFilterPlugin.java | 2 +- .../java/opengrok/auth/plugin/LdapUserPlugin.java | 2 +- .../main/java/opengrok/auth/plugin/UserPlugin.java | 2 +- .../main/java/org/opengrok/suggest/Suggester.java | 6 +++--- .../org/opengrok/suggest/SuggesterProjectData.java | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java index 56449ba6384..2a3477c192c 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java @@ -131,7 +131,7 @@ public void close() { IOUtils.close(ctagsIn); if (ctags != null) { closing = true; - LOGGER.log(Level.FINE, "Destroying ctags command"); + LOGGER.log(Level.FINEST, "Destroying ctags command"); ctags.destroyForcibly(); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java index 779eca0b726..a1da0088672 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java @@ -134,7 +134,7 @@ public void load(Map parameters) { getCurrentSetup().putAll(parameters); getCurrentSetup().putAll(getSetup()); - LOGGER.log(Level.INFO, "[{0}] Stack \"{1}\" is loading.", + LOGGER.log(Level.FINEST, "[{0}] Stack \"{1}\" is loading.", new Object[]{getFlag().toString().toUpperCase(Locale.ROOT), getName()}); diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java index c9dcc826c50..391757c3901 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java @@ -1715,7 +1715,7 @@ public void applyConfig(String configuration, boolean reindex, boolean interacti */ public void applyConfig(Configuration config, boolean reindex, boolean interactive) { setConfiguration(config, interactive); - LOGGER.log(Level.INFO, "Configuration updated"); + LOGGER.log(Level.FINEST, "Configuration updated"); if (reindex) { // We are assuming that each update of configuration means reindex. If dedicated thread is introduced diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java index 1d305bca28f..8a00c0700b1 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java @@ -98,7 +98,7 @@ public boolean accept(File dir, String name) { try (InputStream is = jar.getInputStream(entry)) { byte[] bytes = loadBytes(is); Class c = defineClass(classname, bytes, 0, bytes.length); - LOGGER.log(Level.FINE, "Class \"{0}\" found in file \"{1}\"", + LOGGER.log(Level.FINEST, "Class \"{0}\" found in file \"{1}\"", new Object[]{ classname, f.getAbsolutePath() diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java index e6586a54447..9b2215f815c 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java @@ -358,7 +358,7 @@ public final void reload() { return; } - LOGGER.log(Level.INFO, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); + LOGGER.log(Level.FINEST, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); // trashing out the old instance of the loaded enables us // to reload the stack at runtime diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java index 88e5f105c89..9aa64beb428 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java @@ -325,7 +325,7 @@ private boolean getAccuRevInfo(File wsPath, boolean interactive) { // from the path known by Accurev) if (Files.isSymbolicLink(given)) { - LOGGER.log(Level.INFO, "{0} is symbolic link.", wsPath); + LOGGER.log(Level.FINE, "{0} is symbolic link.", wsPath); // When we know that the two paths DO NOT point to the // same place (that is, the given path is deeper into diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java index 24aa61e6608..5042eaa981a 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java @@ -417,7 +417,7 @@ public void store(History history, Repository repository) return; } - LOGGER.log(Level.FINE, + LOGGER.log(Level.FINEST, "Storing history for repository {0}", new Object[] {repository.getDirectoryName()}); @@ -490,7 +490,7 @@ public void store(History history, Repository repository) fileHistoryCount++; } - LOGGER.log(Level.FINE, "Stored history for {0} files", fileHistoryCount); + LOGGER.log(Level.FINEST, "Stored history for {0} files", fileHistoryCount); if (!handleRenamedFiles) { finishStore(repository, latestRev); @@ -559,7 +559,7 @@ public void store(History history, Repository repository) } catch (InterruptedException ex) { LOGGER.log(Level.SEVERE, "latch exception", ex); } - LOGGER.log(Level.FINE, "Stored history for {0} renamed files", + LOGGER.log(Level.FINEST, "Stored history for {0} renamed files", renamedFileHistoryCount.intValue()); finishStore(repository, latestRev); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java index d7cd2fcfbf6..0d233a99750 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java @@ -48,11 +48,11 @@ public void fileAdd(String path, String analyzer) { @Override public void fileRemove(String path) { - LOGGER.log(Level.FINE, "Remove file:{0}", path); + LOGGER.log(Level.FINEST, "Remove file:{0}", path); } @Override public void fileUpdate(String path) { - LOGGER.log(Level.FINE, "Update: {0}", path); + LOGGER.log(Level.FINEST, "Update: {0}", path); } @Override diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java index 0c32f32a448..dcc65b4833b 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java @@ -608,7 +608,7 @@ public void optimize() throws IOException { try { Statistics elapsed = new Statistics(); String projectDetail = this.project != null ? " for project " + project.getName() : ""; - LOGGER.log(Level.INFO, "Optimizing the index{0}", projectDetail); + LOGGER.log(Level.FINER, "Optimizing the index{0}", projectDetail); Analyzer analyzer = new StandardAnalyzer(); IndexWriterConfig conf = new IndexWriterConfig(analyzer); conf.setOpenMode(OpenMode.CREATE_OR_APPEND); @@ -1702,7 +1702,7 @@ private void finishWriting() throws IOException { hasPendingCommit = true; int n = completer.complete(); - LOGGER.log(Level.FINE, "completed {0} object(s)", n); + LOGGER.log(Level.FINEST, "completed {0} object(s)", n); // Just before commit(), reset the `hasPendingCommit' flag, // since after commit() is called, there is no need for diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java index 41572ad612f..38c3c70e75c 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java @@ -68,13 +68,13 @@ private IndexVersion() { public static void check(List subFilesList) throws Exception { RuntimeEnvironment env = RuntimeEnvironment.getInstance(); File indexRoot = new File(env.getDataRootPath(), IndexDatabase.INDEX_DIR); - LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}", + LOGGER.log(Level.FINEST, "Checking for Lucene index version mismatch in {0}", indexRoot); if (!subFilesList.isEmpty()) { // Assumes projects are enabled. for (String projectName : subFilesList) { - LOGGER.log(Level.FINER, + LOGGER.log(Level.FINEST, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); @@ -82,13 +82,13 @@ public static void check(List subFilesList) throws Exception { } else { if (env.isProjectsEnabled()) { for (String projectName : env.getProjects().keySet()) { - LOGGER.log(Level.FINER, + LOGGER.log(Level.FINEST, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); } } else { - LOGGER.log(Level.FINER, "Checking Lucene index version in {0}", + LOGGER.log(Level.FINEST, "Checking Lucene index version in {0}", indexRoot); checkDir(indexRoot); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java index d92dc157dbf..d17323b31ad 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java @@ -316,7 +316,7 @@ public static void main(String[] argv) { } } - LOGGER.log(Level.INFO, "Indexer version {0} ({1})", + LOGGER.log(Level.FINER, "Indexer version {0} ({1})", new Object[]{Info.getVersion(), Info.getRevision()}); // Create history cache first. @@ -872,7 +872,7 @@ public static void writeConfigToFile(RuntimeEnvironment env, String filename) th if (filename != null) { LOGGER.log(Level.INFO, "Writing configuration to {0}", filename); env.writeConfiguration(new File(filename)); - LOGGER.info("Done..."); + LOGGER.finest("Done..."); } } @@ -976,14 +976,14 @@ public void prepareIndexer(RuntimeEnvironment env, if (createHistoryCache) { // Even if history is disabled globally, it can be enabled for some repositories. if (repositories != null && !repositories.isEmpty()) { - LOGGER.log(Level.INFO, "Generating history cache for repositories: " + + LOGGER.log(Level.FINEST, "Generating history cache for repositories: " + repositories.stream().collect(Collectors.joining(","))); HistoryGuru.getInstance().createCache(repositories); - LOGGER.info("Done..."); + LOGGER.finest("Done..."); } else { - LOGGER.log(Level.INFO, "Generating history cache for all repositories ..."); + LOGGER.log(Level.FINEST, "Generating history cache for all repositories ..."); HistoryGuru.getInstance().createCache(); - LOGGER.info("Done..."); + LOGGER.finest("Done..."); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java index 11734dd3075..459ddca79e1 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java @@ -49,7 +49,7 @@ public static boolean validate(String ctagsBinary) { return false; } - LOGGER.log(Level.INFO, "Using ctags: {0}", output.trim()); + LOGGER.log(Level.FINEST, "Using ctags: {0}", output.trim()); return true; } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java index 45b20a71c48..11004f743ab 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java @@ -171,7 +171,7 @@ public int exec(final boolean reportExceptions, StreamHandler handler) { Map env_map = processBuilder.environment(); env_str = " with environment: " + env_map.toString(); } - LOGGER.log(Level.FINE, + LOGGER.log(Level.FINEST, "Executing command {0} in directory {1}{2}", new Object[] {cmd_str, dir_str, env_str}); diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java index 534d40821c6..d73f8b9789d 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java @@ -179,7 +179,7 @@ public void deleteProject(@PathParam("project") final String projectName) public void deleteProjectData(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.INFO, "deleting data for project {0}", projectName); + logger.log(Level.FINER, "deleting data for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); @@ -204,7 +204,7 @@ public void deleteProjectData(@PathParam("project") String projectName) throws H public void deleteHistoryCache(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.INFO, "deleting history cache for project {0}", projectName); + logger.log(Level.FINEST, "deleting history cache for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); if (repos == null || repos.isEmpty()) { diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java index bf9aed72286..30f5b76fe93 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java @@ -156,7 +156,7 @@ private List getNamedIndexReaders( /** {@inheritDoc} */ @Override public void refresh() { - logger.log(Level.FINE, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); + logger.log(Level.FINEST, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); lock.writeLock().lock(); try { // close and init from scratch because many things may have changed in the configuration @@ -351,7 +351,7 @@ private void scheduleRebuild() { return; } - logger.log(Level.INFO, "Scheduling suggester rebuild in {0}", timeToNextRebuild); + logger.log(Level.FINEST, "Scheduling suggester rebuild in {0}", timeToNextRebuild); future = instance.scheduler.schedule(instance.getRebuildAllProjectsRunnable(), timeToNextRebuild.toMillis(), TimeUnit.MILLISECONDS); diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java index 2d7a72c258e..8d318440874 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java @@ -110,7 +110,7 @@ private void init(Map parameters) { throw new IllegalArgumentException(String.format("Unable to read the file \"%s\"", filePath), e); } - LOGGER.log(Level.FINE, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", + LOGGER.log(Level.FINEST, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", new Object[]{ldapAttr, filePath, ldapUserInstance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java index bc9fbe08446..08dc3a4a8b0 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java @@ -91,7 +91,7 @@ public void load(Map parameters) { loadTransforms(transformsString); } - LOGGER.log(Level.FINE, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", + LOGGER.log(Level.FINEST, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", new Object[]{ldapFilter, ldapUserInstance, transforms}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java index 050faebd898..6d6cc9a2441 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java @@ -104,7 +104,7 @@ private void init(Map parameters) { instance = Integer.parseInt(instance_param); } - LOGGER.log(Level.FINE, "LdapUser plugin loaded with filter={0}, " + + LOGGER.log(Level.FINEST, "LdapUser plugin loaded with filter={0}, " + "attributes={1}, useDN={2}, instance={3}", new Object[]{ldapFilter, attributes, useDN, instance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java index dadfd21ed7d..ade430d2b05 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java @@ -74,7 +74,7 @@ public void load(Map parameters) { DECODER_CLASS_PARAM, UserPlugin.class.getName())); } - LOGGER.log(Level.INFO, "loading decoder: {0}", decoder_name); + LOGGER.log(Level.FINEST, "loading decoder: {0}", decoder_name); try { decoder = getDecoder(decoder_name); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | diff --git a/suggester/src/main/java/org/opengrok/suggest/Suggester.java b/suggester/src/main/java/org/opengrok/suggest/Suggester.java index 3e8e1be9b38..8671535ba97 100644 --- a/suggester/src/main/java/org/opengrok/suggest/Suggester.java +++ b/suggester/src/main/java/org/opengrok/suggest/Suggester.java @@ -236,7 +236,7 @@ public void rebuild(final Collection indexDirs) { synchronized (lock) { Instant start = Instant.now(); - logger.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs); + logger.log(Level.FINE, "Rebuilding the following suggesters: {0}", indexDirs); ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel); @@ -257,7 +257,7 @@ private Runnable getRebuildRunnable(final SuggesterProjectData data) { return () -> { try { Instant start = Instant.now(); - logger.log(Level.FINE, "Rebuilding {0}", data); + logger.log(Level.FINEST, "Rebuilding {0}", data); data.rebuild(); Duration d = Duration.between(start, Instant.now()); @@ -278,7 +278,7 @@ public void remove(final Iterable names) { } synchronized (lock) { - logger.log(Level.INFO, "Removing following suggesters: {0}", names); + logger.log(Level.FINER, "Removing following suggesters: {0}", names); for (String suggesterName : names) { SuggesterProjectData collection = projectData.get(suggesterName); diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java index 210b7affee1..5660477fd61 100644 --- a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java +++ b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java @@ -334,7 +334,7 @@ private double getAverageLength(final String field) { if (averageLengths.containsKey(field)) { return averageLengths.get(field); } - logger.log(Level.FINE, "Could not determine average length for field {0}, using default one", field); + logger.log(Level.FINEST, "Could not determine average length for field {0}, using default one", field); return AVERAGE_LENGTH_DEFAULT; } From 4ef4b1d167ba5545a8b39554e60a16c605b786c7 Mon Sep 17 00:00:00 2001 From: saledouble Date: Wed, 18 Dec 2019 12:11:08 -0500 Subject: [PATCH 2/3] Revert "Rejuvenate log levels" This reverts commit d5fce09e7b443de6317ada7a98b9e470bc0343f7. --- .../java/org/opengrok/indexer/analysis/Ctags.java | 2 +- .../indexer/authorization/AuthorizationStack.java | 2 +- .../indexer/configuration/RuntimeEnvironment.java | 2 +- .../indexer/framework/PluginClassLoader.java | 2 +- .../opengrok/indexer/framework/PluginFramework.java | 2 +- .../opengrok/indexer/history/AccuRevRepository.java | 2 +- .../opengrok/indexer/history/FileHistoryCache.java | 6 +++--- .../indexer/index/DefaultIndexChangedListener.java | 4 ++-- .../org/opengrok/indexer/index/IndexDatabase.java | 4 ++-- .../org/opengrok/indexer/index/IndexVersion.java | 8 ++++---- .../java/org/opengrok/indexer/index/Indexer.java | 12 ++++++------ .../java/org/opengrok/indexer/util/CtagsUtil.java | 2 +- .../java/org/opengrok/indexer/util/Executor.java | 2 +- .../web/api/v1/controller/ProjectsController.java | 4 ++-- .../provider/service/impl/SuggesterServiceImpl.java | 4 ++-- .../java/opengrok/auth/plugin/LdapAttrPlugin.java | 2 +- .../java/opengrok/auth/plugin/LdapFilterPlugin.java | 2 +- .../java/opengrok/auth/plugin/LdapUserPlugin.java | 2 +- .../main/java/opengrok/auth/plugin/UserPlugin.java | 2 +- .../main/java/org/opengrok/suggest/Suggester.java | 6 +++--- .../org/opengrok/suggest/SuggesterProjectData.java | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java index 2a3477c192c..56449ba6384 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java @@ -131,7 +131,7 @@ public void close() { IOUtils.close(ctagsIn); if (ctags != null) { closing = true; - LOGGER.log(Level.FINEST, "Destroying ctags command"); + LOGGER.log(Level.FINE, "Destroying ctags command"); ctags.destroyForcibly(); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java index a1da0088672..779eca0b726 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java @@ -134,7 +134,7 @@ public void load(Map parameters) { getCurrentSetup().putAll(parameters); getCurrentSetup().putAll(getSetup()); - LOGGER.log(Level.FINEST, "[{0}] Stack \"{1}\" is loading.", + LOGGER.log(Level.INFO, "[{0}] Stack \"{1}\" is loading.", new Object[]{getFlag().toString().toUpperCase(Locale.ROOT), getName()}); diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java index 391757c3901..c9dcc826c50 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java @@ -1715,7 +1715,7 @@ public void applyConfig(String configuration, boolean reindex, boolean interacti */ public void applyConfig(Configuration config, boolean reindex, boolean interactive) { setConfiguration(config, interactive); - LOGGER.log(Level.FINEST, "Configuration updated"); + LOGGER.log(Level.INFO, "Configuration updated"); if (reindex) { // We are assuming that each update of configuration means reindex. If dedicated thread is introduced diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java index 8a00c0700b1..1d305bca28f 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java @@ -98,7 +98,7 @@ public boolean accept(File dir, String name) { try (InputStream is = jar.getInputStream(entry)) { byte[] bytes = loadBytes(is); Class c = defineClass(classname, bytes, 0, bytes.length); - LOGGER.log(Level.FINEST, "Class \"{0}\" found in file \"{1}\"", + LOGGER.log(Level.FINE, "Class \"{0}\" found in file \"{1}\"", new Object[]{ classname, f.getAbsolutePath() diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java index 9b2215f815c..e6586a54447 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java @@ -358,7 +358,7 @@ public final void reload() { return; } - LOGGER.log(Level.FINEST, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); + LOGGER.log(Level.INFO, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); // trashing out the old instance of the loaded enables us // to reload the stack at runtime diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java index 9aa64beb428..88e5f105c89 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java @@ -325,7 +325,7 @@ private boolean getAccuRevInfo(File wsPath, boolean interactive) { // from the path known by Accurev) if (Files.isSymbolicLink(given)) { - LOGGER.log(Level.FINE, "{0} is symbolic link.", wsPath); + LOGGER.log(Level.INFO, "{0} is symbolic link.", wsPath); // When we know that the two paths DO NOT point to the // same place (that is, the given path is deeper into diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java index 5042eaa981a..24aa61e6608 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java @@ -417,7 +417,7 @@ public void store(History history, Repository repository) return; } - LOGGER.log(Level.FINEST, + LOGGER.log(Level.FINE, "Storing history for repository {0}", new Object[] {repository.getDirectoryName()}); @@ -490,7 +490,7 @@ public void store(History history, Repository repository) fileHistoryCount++; } - LOGGER.log(Level.FINEST, "Stored history for {0} files", fileHistoryCount); + LOGGER.log(Level.FINE, "Stored history for {0} files", fileHistoryCount); if (!handleRenamedFiles) { finishStore(repository, latestRev); @@ -559,7 +559,7 @@ public void store(History history, Repository repository) } catch (InterruptedException ex) { LOGGER.log(Level.SEVERE, "latch exception", ex); } - LOGGER.log(Level.FINEST, "Stored history for {0} renamed files", + LOGGER.log(Level.FINE, "Stored history for {0} renamed files", renamedFileHistoryCount.intValue()); finishStore(repository, latestRev); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java index 0d233a99750..d7cd2fcfbf6 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java @@ -48,11 +48,11 @@ public void fileAdd(String path, String analyzer) { @Override public void fileRemove(String path) { - LOGGER.log(Level.FINEST, "Remove file:{0}", path); + LOGGER.log(Level.FINE, "Remove file:{0}", path); } @Override public void fileUpdate(String path) { - LOGGER.log(Level.FINEST, "Update: {0}", path); + LOGGER.log(Level.FINE, "Update: {0}", path); } @Override diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java index dcc65b4833b..0c32f32a448 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java @@ -608,7 +608,7 @@ public void optimize() throws IOException { try { Statistics elapsed = new Statistics(); String projectDetail = this.project != null ? " for project " + project.getName() : ""; - LOGGER.log(Level.FINER, "Optimizing the index{0}", projectDetail); + LOGGER.log(Level.INFO, "Optimizing the index{0}", projectDetail); Analyzer analyzer = new StandardAnalyzer(); IndexWriterConfig conf = new IndexWriterConfig(analyzer); conf.setOpenMode(OpenMode.CREATE_OR_APPEND); @@ -1702,7 +1702,7 @@ private void finishWriting() throws IOException { hasPendingCommit = true; int n = completer.complete(); - LOGGER.log(Level.FINEST, "completed {0} object(s)", n); + LOGGER.log(Level.FINE, "completed {0} object(s)", n); // Just before commit(), reset the `hasPendingCommit' flag, // since after commit() is called, there is no need for diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java index 38c3c70e75c..41572ad612f 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java @@ -68,13 +68,13 @@ private IndexVersion() { public static void check(List subFilesList) throws Exception { RuntimeEnvironment env = RuntimeEnvironment.getInstance(); File indexRoot = new File(env.getDataRootPath(), IndexDatabase.INDEX_DIR); - LOGGER.log(Level.FINEST, "Checking for Lucene index version mismatch in {0}", + LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}", indexRoot); if (!subFilesList.isEmpty()) { // Assumes projects are enabled. for (String projectName : subFilesList) { - LOGGER.log(Level.FINEST, + LOGGER.log(Level.FINER, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); @@ -82,13 +82,13 @@ public static void check(List subFilesList) throws Exception { } else { if (env.isProjectsEnabled()) { for (String projectName : env.getProjects().keySet()) { - LOGGER.log(Level.FINEST, + LOGGER.log(Level.FINER, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); } } else { - LOGGER.log(Level.FINEST, "Checking Lucene index version in {0}", + LOGGER.log(Level.FINER, "Checking Lucene index version in {0}", indexRoot); checkDir(indexRoot); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java index d17323b31ad..d92dc157dbf 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java @@ -316,7 +316,7 @@ public static void main(String[] argv) { } } - LOGGER.log(Level.FINER, "Indexer version {0} ({1})", + LOGGER.log(Level.INFO, "Indexer version {0} ({1})", new Object[]{Info.getVersion(), Info.getRevision()}); // Create history cache first. @@ -872,7 +872,7 @@ public static void writeConfigToFile(RuntimeEnvironment env, String filename) th if (filename != null) { LOGGER.log(Level.INFO, "Writing configuration to {0}", filename); env.writeConfiguration(new File(filename)); - LOGGER.finest("Done..."); + LOGGER.info("Done..."); } } @@ -976,14 +976,14 @@ public void prepareIndexer(RuntimeEnvironment env, if (createHistoryCache) { // Even if history is disabled globally, it can be enabled for some repositories. if (repositories != null && !repositories.isEmpty()) { - LOGGER.log(Level.FINEST, "Generating history cache for repositories: " + + LOGGER.log(Level.INFO, "Generating history cache for repositories: " + repositories.stream().collect(Collectors.joining(","))); HistoryGuru.getInstance().createCache(repositories); - LOGGER.finest("Done..."); + LOGGER.info("Done..."); } else { - LOGGER.log(Level.FINEST, "Generating history cache for all repositories ..."); + LOGGER.log(Level.INFO, "Generating history cache for all repositories ..."); HistoryGuru.getInstance().createCache(); - LOGGER.finest("Done..."); + LOGGER.info("Done..."); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java index 459ddca79e1..11734dd3075 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java @@ -49,7 +49,7 @@ public static boolean validate(String ctagsBinary) { return false; } - LOGGER.log(Level.FINEST, "Using ctags: {0}", output.trim()); + LOGGER.log(Level.INFO, "Using ctags: {0}", output.trim()); return true; } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java index 11004f743ab..45b20a71c48 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java @@ -171,7 +171,7 @@ public int exec(final boolean reportExceptions, StreamHandler handler) { Map env_map = processBuilder.environment(); env_str = " with environment: " + env_map.toString(); } - LOGGER.log(Level.FINEST, + LOGGER.log(Level.FINE, "Executing command {0} in directory {1}{2}", new Object[] {cmd_str, dir_str, env_str}); diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java index d73f8b9789d..534d40821c6 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java @@ -179,7 +179,7 @@ public void deleteProject(@PathParam("project") final String projectName) public void deleteProjectData(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.FINER, "deleting data for project {0}", projectName); + logger.log(Level.INFO, "deleting data for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); @@ -204,7 +204,7 @@ public void deleteProjectData(@PathParam("project") String projectName) throws H public void deleteHistoryCache(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.FINEST, "deleting history cache for project {0}", projectName); + logger.log(Level.INFO, "deleting history cache for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); if (repos == null || repos.isEmpty()) { diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java index 30f5b76fe93..bf9aed72286 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java @@ -156,7 +156,7 @@ private List getNamedIndexReaders( /** {@inheritDoc} */ @Override public void refresh() { - logger.log(Level.FINEST, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); + logger.log(Level.FINE, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); lock.writeLock().lock(); try { // close and init from scratch because many things may have changed in the configuration @@ -351,7 +351,7 @@ private void scheduleRebuild() { return; } - logger.log(Level.FINEST, "Scheduling suggester rebuild in {0}", timeToNextRebuild); + logger.log(Level.INFO, "Scheduling suggester rebuild in {0}", timeToNextRebuild); future = instance.scheduler.schedule(instance.getRebuildAllProjectsRunnable(), timeToNextRebuild.toMillis(), TimeUnit.MILLISECONDS); diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java index 8d318440874..2d7a72c258e 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java @@ -110,7 +110,7 @@ private void init(Map parameters) { throw new IllegalArgumentException(String.format("Unable to read the file \"%s\"", filePath), e); } - LOGGER.log(Level.FINEST, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", + LOGGER.log(Level.FINE, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", new Object[]{ldapAttr, filePath, ldapUserInstance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java index 08dc3a4a8b0..bc9fbe08446 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java @@ -91,7 +91,7 @@ public void load(Map parameters) { loadTransforms(transformsString); } - LOGGER.log(Level.FINEST, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", + LOGGER.log(Level.FINE, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", new Object[]{ldapFilter, ldapUserInstance, transforms}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java index 6d6cc9a2441..050faebd898 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java @@ -104,7 +104,7 @@ private void init(Map parameters) { instance = Integer.parseInt(instance_param); } - LOGGER.log(Level.FINEST, "LdapUser plugin loaded with filter={0}, " + + LOGGER.log(Level.FINE, "LdapUser plugin loaded with filter={0}, " + "attributes={1}, useDN={2}, instance={3}", new Object[]{ldapFilter, attributes, useDN, instance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java index ade430d2b05..dadfd21ed7d 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java @@ -74,7 +74,7 @@ public void load(Map parameters) { DECODER_CLASS_PARAM, UserPlugin.class.getName())); } - LOGGER.log(Level.FINEST, "loading decoder: {0}", decoder_name); + LOGGER.log(Level.INFO, "loading decoder: {0}", decoder_name); try { decoder = getDecoder(decoder_name); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | diff --git a/suggester/src/main/java/org/opengrok/suggest/Suggester.java b/suggester/src/main/java/org/opengrok/suggest/Suggester.java index 8671535ba97..3e8e1be9b38 100644 --- a/suggester/src/main/java/org/opengrok/suggest/Suggester.java +++ b/suggester/src/main/java/org/opengrok/suggest/Suggester.java @@ -236,7 +236,7 @@ public void rebuild(final Collection indexDirs) { synchronized (lock) { Instant start = Instant.now(); - logger.log(Level.FINE, "Rebuilding the following suggesters: {0}", indexDirs); + logger.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs); ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel); @@ -257,7 +257,7 @@ private Runnable getRebuildRunnable(final SuggesterProjectData data) { return () -> { try { Instant start = Instant.now(); - logger.log(Level.FINEST, "Rebuilding {0}", data); + logger.log(Level.FINE, "Rebuilding {0}", data); data.rebuild(); Duration d = Duration.between(start, Instant.now()); @@ -278,7 +278,7 @@ public void remove(final Iterable names) { } synchronized (lock) { - logger.log(Level.FINER, "Removing following suggesters: {0}", names); + logger.log(Level.INFO, "Removing following suggesters: {0}", names); for (String suggesterName : names) { SuggesterProjectData collection = projectData.get(suggesterName); diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java index 5660477fd61..210b7affee1 100644 --- a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java +++ b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java @@ -334,7 +334,7 @@ private double getAverageLength(final String field) { if (averageLengths.containsKey(field)) { return averageLengths.get(field); } - logger.log(Level.FINEST, "Could not determine average length for field {0}, using default one", field); + logger.log(Level.FINE, "Could not determine average length for field {0}, using default one", field); return AVERAGE_LENGTH_DEFAULT; } From acbcf46570fc482daa853a3d06a41aa9e2b8d9aa Mon Sep 17 00:00:00 2001 From: saledouble Date: Wed, 18 Dec 2019 14:12:03 -0500 Subject: [PATCH 3/3] Rejuvenate log levels --- .../main/java/org/opengrok/indexer/analysis/Ctags.java | 2 +- .../indexer/authorization/AuthorizationStack.java | 2 +- .../indexer/configuration/RuntimeEnvironment.java | 2 +- .../opengrok/indexer/framework/PluginClassLoader.java | 2 +- .../opengrok/indexer/framework/PluginFramework.java | 2 +- .../opengrok/indexer/history/AccuRevRepository.java | 2 +- .../org/opengrok/indexer/history/FileHistoryCache.java | 6 +++--- .../indexer/index/DefaultIndexChangedListener.java | 4 ++-- .../java/org/opengrok/indexer/index/IndexDatabase.java | 4 ++-- .../java/org/opengrok/indexer/index/IndexVersion.java | 8 ++++---- .../main/java/org/opengrok/indexer/index/Indexer.java | 10 +++++----- .../main/java/org/opengrok/indexer/util/CtagsUtil.java | 2 +- .../main/java/org/opengrok/indexer/util/Executor.java | 2 +- .../web/api/v1/controller/ProjectsController.java | 4 ++-- .../provider/service/impl/SuggesterServiceImpl.java | 4 ++-- .../main/java/opengrok/auth/plugin/LdapAttrPlugin.java | 2 +- .../java/opengrok/auth/plugin/LdapFilterPlugin.java | 2 +- .../main/java/opengrok/auth/plugin/LdapUserPlugin.java | 2 +- .../src/main/java/opengrok/auth/plugin/UserPlugin.java | 2 +- .../src/main/java/org/opengrok/suggest/Suggester.java | 6 +++--- .../org/opengrok/suggest/SuggesterProjectData.java | 2 +- 21 files changed, 36 insertions(+), 36 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java index 56449ba6384..f27cfc71a9f 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/Ctags.java @@ -131,7 +131,7 @@ public void close() { IOUtils.close(ctagsIn); if (ctags != null) { closing = true; - LOGGER.log(Level.FINE, "Destroying ctags command"); + LOGGER.log(Level.FINER, "Destroying ctags command"); ctags.destroyForcibly(); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java index 779eca0b726..b290fb2a4b0 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/authorization/AuthorizationStack.java @@ -134,7 +134,7 @@ public void load(Map parameters) { getCurrentSetup().putAll(parameters); getCurrentSetup().putAll(getSetup()); - LOGGER.log(Level.INFO, "[{0}] Stack \"{1}\" is loading.", + LOGGER.log(Level.FINE, "[{0}] Stack \"{1}\" is loading.", new Object[]{getFlag().toString().toUpperCase(Locale.ROOT), getName()}); diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java index c9dcc826c50..901dc29e832 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/RuntimeEnvironment.java @@ -1715,7 +1715,7 @@ public void applyConfig(String configuration, boolean reindex, boolean interacti */ public void applyConfig(Configuration config, boolean reindex, boolean interactive) { setConfiguration(config, interactive); - LOGGER.log(Level.INFO, "Configuration updated"); + LOGGER.log(Level.FINE, "Configuration updated"); if (reindex) { // We are assuming that each update of configuration means reindex. If dedicated thread is introduced diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java index 1d305bca28f..97920d3188d 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginClassLoader.java @@ -98,7 +98,7 @@ public boolean accept(File dir, String name) { try (InputStream is = jar.getInputStream(entry)) { byte[] bytes = loadBytes(is); Class c = defineClass(classname, bytes, 0, bytes.length); - LOGGER.log(Level.FINE, "Class \"{0}\" found in file \"{1}\"", + LOGGER.log(Level.FINER, "Class \"{0}\" found in file \"{1}\"", new Object[]{ classname, f.getAbsolutePath() diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java index e6586a54447..246fafeb917 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/framework/PluginFramework.java @@ -358,7 +358,7 @@ public final void reload() { return; } - LOGGER.log(Level.INFO, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); + LOGGER.log(Level.FINE, "Plugins are being reloaded from {0}", pluginDirectory.getAbsolutePath()); // trashing out the old instance of the loaded enables us // to reload the stack at runtime diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java index 88e5f105c89..9aa64beb428 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/AccuRevRepository.java @@ -325,7 +325,7 @@ private boolean getAccuRevInfo(File wsPath, boolean interactive) { // from the path known by Accurev) if (Files.isSymbolicLink(given)) { - LOGGER.log(Level.INFO, "{0} is symbolic link.", wsPath); + LOGGER.log(Level.FINE, "{0} is symbolic link.", wsPath); // When we know that the two paths DO NOT point to the // same place (that is, the given path is deeper into diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java index 24aa61e6608..276f48f2568 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java @@ -417,7 +417,7 @@ public void store(History history, Repository repository) return; } - LOGGER.log(Level.FINE, + LOGGER.log(Level.FINER, "Storing history for repository {0}", new Object[] {repository.getDirectoryName()}); @@ -490,7 +490,7 @@ public void store(History history, Repository repository) fileHistoryCount++; } - LOGGER.log(Level.FINE, "Stored history for {0} files", fileHistoryCount); + LOGGER.log(Level.FINER, "Stored history for {0} files", fileHistoryCount); if (!handleRenamedFiles) { finishStore(repository, latestRev); @@ -559,7 +559,7 @@ public void store(History history, Repository repository) } catch (InterruptedException ex) { LOGGER.log(Level.SEVERE, "latch exception", ex); } - LOGGER.log(Level.FINE, "Stored history for {0} renamed files", + LOGGER.log(Level.FINER, "Stored history for {0} renamed files", renamedFileHistoryCount.intValue()); finishStore(repository, latestRev); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java index d7cd2fcfbf6..72c35dd760d 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/DefaultIndexChangedListener.java @@ -48,11 +48,11 @@ public void fileAdd(String path, String analyzer) { @Override public void fileRemove(String path) { - LOGGER.log(Level.FINE, "Remove file:{0}", path); + LOGGER.log(Level.FINER, "Remove file:{0}", path); } @Override public void fileUpdate(String path) { - LOGGER.log(Level.FINE, "Update: {0}", path); + LOGGER.log(Level.FINER, "Update: {0}", path); } @Override diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java index 0c32f32a448..4e34ec5ceaf 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexDatabase.java @@ -608,7 +608,7 @@ public void optimize() throws IOException { try { Statistics elapsed = new Statistics(); String projectDetail = this.project != null ? " for project " + project.getName() : ""; - LOGGER.log(Level.INFO, "Optimizing the index{0}", projectDetail); + LOGGER.log(Level.FINE, "Optimizing the index{0}", projectDetail); Analyzer analyzer = new StandardAnalyzer(); IndexWriterConfig conf = new IndexWriterConfig(analyzer); conf.setOpenMode(OpenMode.CREATE_OR_APPEND); @@ -1702,7 +1702,7 @@ private void finishWriting() throws IOException { hasPendingCommit = true; int n = completer.complete(); - LOGGER.log(Level.FINE, "completed {0} object(s)", n); + LOGGER.log(Level.FINER, "completed {0} object(s)", n); // Just before commit(), reset the `hasPendingCommit' flag, // since after commit() is called, there is no need for diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java index 41572ad612f..2752cd8f721 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/IndexVersion.java @@ -68,13 +68,13 @@ private IndexVersion() { public static void check(List subFilesList) throws Exception { RuntimeEnvironment env = RuntimeEnvironment.getInstance(); File indexRoot = new File(env.getDataRootPath(), IndexDatabase.INDEX_DIR); - LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}", + LOGGER.log(Level.FINER, "Checking for Lucene index version mismatch in {0}", indexRoot); if (!subFilesList.isEmpty()) { // Assumes projects are enabled. for (String projectName : subFilesList) { - LOGGER.log(Level.FINER, + LOGGER.log(Level.FINEST, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); @@ -82,13 +82,13 @@ public static void check(List subFilesList) throws Exception { } else { if (env.isProjectsEnabled()) { for (String projectName : env.getProjects().keySet()) { - LOGGER.log(Level.FINER, + LOGGER.log(Level.FINEST, "Checking Lucene index version in project {0}", projectName); checkDir(new File(indexRoot, projectName)); } } else { - LOGGER.log(Level.FINER, "Checking Lucene index version in {0}", + LOGGER.log(Level.FINEST, "Checking Lucene index version in {0}", indexRoot); checkDir(indexRoot); } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java index d92dc157dbf..daaf4f5d576 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/index/Indexer.java @@ -872,7 +872,7 @@ public static void writeConfigToFile(RuntimeEnvironment env, String filename) th if (filename != null) { LOGGER.log(Level.INFO, "Writing configuration to {0}", filename); env.writeConfiguration(new File(filename)); - LOGGER.info("Done..."); + LOGGER.fine("Done..."); } } @@ -976,14 +976,14 @@ public void prepareIndexer(RuntimeEnvironment env, if (createHistoryCache) { // Even if history is disabled globally, it can be enabled for some repositories. if (repositories != null && !repositories.isEmpty()) { - LOGGER.log(Level.INFO, "Generating history cache for repositories: " + + LOGGER.log(Level.FINE, "Generating history cache for repositories: " + repositories.stream().collect(Collectors.joining(","))); HistoryGuru.getInstance().createCache(repositories); - LOGGER.info("Done..."); + LOGGER.fine("Done..."); } else { - LOGGER.log(Level.INFO, "Generating history cache for all repositories ..."); + LOGGER.log(Level.FINE, "Generating history cache for all repositories ..."); HistoryGuru.getInstance().createCache(); - LOGGER.info("Done..."); + LOGGER.fine("Done..."); } } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java index 11734dd3075..1598e203d15 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/CtagsUtil.java @@ -49,7 +49,7 @@ public static boolean validate(String ctagsBinary) { return false; } - LOGGER.log(Level.INFO, "Using ctags: {0}", output.trim()); + LOGGER.log(Level.FINE, "Using ctags: {0}", output.trim()); return true; } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java index 45b20a71c48..3572570794f 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/util/Executor.java @@ -171,7 +171,7 @@ public int exec(final boolean reportExceptions, StreamHandler handler) { Map env_map = processBuilder.environment(); env_str = " with environment: " + env_map.toString(); } - LOGGER.log(Level.FINE, + LOGGER.log(Level.FINER, "Executing command {0} in directory {1}{2}", new Object[] {cmd_str, dir_str, env_str}); diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java index 534d40821c6..e6764cc3cad 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/ProjectsController.java @@ -179,7 +179,7 @@ public void deleteProject(@PathParam("project") final String projectName) public void deleteProjectData(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.INFO, "deleting data for project {0}", projectName); + logger.log(Level.FINE, "deleting data for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); @@ -204,7 +204,7 @@ public void deleteProjectData(@PathParam("project") String projectName) throws H public void deleteHistoryCache(@PathParam("project") String projectName) throws HistoryException { Project project = disableProject(projectName); - logger.log(Level.INFO, "deleting history cache for project {0}", projectName); + logger.log(Level.FINE, "deleting history cache for project {0}", projectName); List repos = env.getProjectRepositoriesMap().get(project); if (repos == null || repos.isEmpty()) { diff --git a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java index bf9aed72286..df4f60b434e 100644 --- a/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java +++ b/opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/provider/service/impl/SuggesterServiceImpl.java @@ -156,7 +156,7 @@ private List getNamedIndexReaders( /** {@inheritDoc} */ @Override public void refresh() { - logger.log(Level.FINE, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); + logger.log(Level.FINER, "Refreshing suggester for new configuration {0}", env.getSuggesterConfig()); lock.writeLock().lock(); try { // close and init from scratch because many things may have changed in the configuration @@ -351,7 +351,7 @@ private void scheduleRebuild() { return; } - logger.log(Level.INFO, "Scheduling suggester rebuild in {0}", timeToNextRebuild); + logger.log(Level.FINE, "Scheduling suggester rebuild in {0}", timeToNextRebuild); future = instance.scheduler.schedule(instance.getRebuildAllProjectsRunnable(), timeToNextRebuild.toMillis(), TimeUnit.MILLISECONDS); diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java index 2d7a72c258e..245d0affc10 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapAttrPlugin.java @@ -110,7 +110,7 @@ private void init(Map parameters) { throw new IllegalArgumentException(String.format("Unable to read the file \"%s\"", filePath), e); } - LOGGER.log(Level.FINE, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", + LOGGER.log(Level.FINER, "LdapAttrPlugin plugin loaded with attr={0}, whitelist={1}, instance={2}", new Object[]{ldapAttr, filePath, ldapUserInstance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java index bc9fbe08446..931fdac461b 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapFilterPlugin.java @@ -91,7 +91,7 @@ public void load(Map parameters) { loadTransforms(transformsString); } - LOGGER.log(Level.FINE, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", + LOGGER.log(Level.FINER, "LdapFilter plugin loaded with filter={0}, instance={1}, transforms={2}", new Object[]{ldapFilter, ldapUserInstance, transforms}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java index 050faebd898..09129866d6c 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/LdapUserPlugin.java @@ -104,7 +104,7 @@ private void init(Map parameters) { instance = Integer.parseInt(instance_param); } - LOGGER.log(Level.FINE, "LdapUser plugin loaded with filter={0}, " + + LOGGER.log(Level.FINER, "LdapUser plugin loaded with filter={0}, " + "attributes={1}, useDN={2}, instance={3}", new Object[]{ldapFilter, attributes, useDN, instance}); } diff --git a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java index dadfd21ed7d..3c7c7a80757 100644 --- a/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java +++ b/plugins/src/main/java/opengrok/auth/plugin/UserPlugin.java @@ -74,7 +74,7 @@ public void load(Map parameters) { DECODER_CLASS_PARAM, UserPlugin.class.getName())); } - LOGGER.log(Level.INFO, "loading decoder: {0}", decoder_name); + LOGGER.log(Level.FINE, "loading decoder: {0}", decoder_name); try { decoder = getDecoder(decoder_name); } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | diff --git a/suggester/src/main/java/org/opengrok/suggest/Suggester.java b/suggester/src/main/java/org/opengrok/suggest/Suggester.java index 3e8e1be9b38..a9493ceea0d 100644 --- a/suggester/src/main/java/org/opengrok/suggest/Suggester.java +++ b/suggester/src/main/java/org/opengrok/suggest/Suggester.java @@ -236,7 +236,7 @@ public void rebuild(final Collection indexDirs) { synchronized (lock) { Instant start = Instant.now(); - logger.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs); + logger.log(Level.FINE, "Rebuilding the following suggesters: {0}", indexDirs); ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel); @@ -257,7 +257,7 @@ private Runnable getRebuildRunnable(final SuggesterProjectData data) { return () -> { try { Instant start = Instant.now(); - logger.log(Level.FINE, "Rebuilding {0}", data); + logger.log(Level.FINER, "Rebuilding {0}", data); data.rebuild(); Duration d = Duration.between(start, Instant.now()); @@ -278,7 +278,7 @@ public void remove(final Iterable names) { } synchronized (lock) { - logger.log(Level.INFO, "Removing following suggesters: {0}", names); + logger.log(Level.FINE, "Removing following suggesters: {0}", names); for (String suggesterName : names) { SuggesterProjectData collection = projectData.get(suggesterName); diff --git a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java index 210b7affee1..71ebe8b1bef 100644 --- a/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java +++ b/suggester/src/main/java/org/opengrok/suggest/SuggesterProjectData.java @@ -334,7 +334,7 @@ private double getAverageLength(final String field) { if (averageLengths.containsKey(field)) { return averageLengths.get(field); } - logger.log(Level.FINE, "Could not determine average length for field {0}, using default one", field); + logger.log(Level.FINER, "Could not determine average length for field {0}, using default one", field); return AVERAGE_LENGTH_DEFAULT; }