From 53c0b8305fa0da8db27794605a8aba8d7a8b4e3d Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 19 Dec 2014 13:50:39 -0600 Subject: [PATCH 1/2] Change default log level to INFO The defualt log level was previously set to WARN, meaning INFO-level logging and above would not be output. This was confusing, as INFO statements were intended to be used to convey basic, helpful information. To that end, the default level has been dropped down to INFO. This also required updating log.info statements that were outputting DEBUG-style information to be similarly adjusted to log.debug statements. --- src/main/java/org/scijava/log/AbstractLogService.java | 4 ++-- .../java/org/scijava/platform/DefaultPlatformService.java | 2 +- .../java/org/scijava/plugin/AbstractSingletonService.java | 2 +- src/main/java/org/scijava/plugin/AbstractWrapperService.java | 2 +- src/main/java/org/scijava/plugin/DefaultPluginService.java | 2 +- src/main/java/org/scijava/script/ScriptFinder.java | 2 +- src/main/java/org/scijava/ui/DefaultUIService.java | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/scijava/log/AbstractLogService.java b/src/main/java/org/scijava/log/AbstractLogService.java index fefc5a5d0..53062fdc8 100644 --- a/src/main/java/org/scijava/log/AbstractLogService.java +++ b/src/main/java/org/scijava/log/AbstractLogService.java @@ -44,7 +44,7 @@ */ public abstract class AbstractLogService extends AbstractService implements LogService { - private int currentLevel = System.getenv("DEBUG") == null ? WARN : DEBUG; + private int currentLevel = System.getenv("DEBUG") == null ? INFO : DEBUG; private Map classAndPackageLevels = new HashMap(); @@ -77,7 +77,7 @@ public AbstractLogService() { if (getLevel() == 0) { // use the default, which is WARN unless the DEBUG env. variable is set - setLevel(System.getenv("DEBUG") == null ? WARN : DEBUG); + setLevel(System.getenv("DEBUG") == null ? INFO : DEBUG); } // populate custom class- and package-specific log level properties diff --git a/src/main/java/org/scijava/platform/DefaultPlatformService.java b/src/main/java/org/scijava/platform/DefaultPlatformService.java index 446c4c9a9..9eae1470b 100644 --- a/src/main/java/org/scijava/platform/DefaultPlatformService.java +++ b/src/main/java/org/scijava/platform/DefaultPlatformService.java @@ -164,7 +164,7 @@ public void initialize() { log.debug("Configuring platform: " + platform.getClass().getName()); platform.configure(this); } - if (platforms.size() == 0) log.info("No platforms to configure."); + if (platforms.size() == 0) log.debug("No platforms to configure."); } // -- Disposable methods -- diff --git a/src/main/java/org/scijava/plugin/AbstractSingletonService.java b/src/main/java/org/scijava/plugin/AbstractSingletonService.java index 3d5b013c4..d965238a8 100644 --- a/src/main/java/org/scijava/plugin/AbstractSingletonService.java +++ b/src/main/java/org/scijava/plugin/AbstractSingletonService.java @@ -125,7 +125,7 @@ private synchronized void initInstances() { map.put(ptClass, plugin); } - log.info("Found " + list.size() + " " + getPluginType().getSimpleName() + + log.debug("Found " + list.size() + " " + getPluginType().getSimpleName() + " plugins."); instanceMap = map; diff --git a/src/main/java/org/scijava/plugin/AbstractWrapperService.java b/src/main/java/org/scijava/plugin/AbstractWrapperService.java index 89a4756bc..964916608 100644 --- a/src/main/java/org/scijava/plugin/AbstractWrapperService.java +++ b/src/main/java/org/scijava/plugin/AbstractWrapperService.java @@ -64,7 +64,7 @@ public PT create(final D data) { @Override public void initialize() { if (log != null) { - log.info("Found " + getPlugins().size() + " " + + log.debug("Found " + getPlugins().size() + " " + getPluginType().getSimpleName() + " plugins."); } } diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java index db1048a86..74e26aa25 100644 --- a/src/main/java/org/scijava/plugin/DefaultPluginService.java +++ b/src/main/java/org/scijava/plugin/DefaultPluginService.java @@ -249,7 +249,7 @@ public List createInstances( public void initialize() { pluginIndex = context().getPluginIndex(); - log.info("Found " + pluginIndex.size() + " plugins."); + log.debug("Found " + pluginIndex.size() + " plugins."); if (log.isDebug()) { for (final PluginInfo info : pluginIndex) { log.debug("- " + info); diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java index 528b6b4d4..c3bb8d3cc 100644 --- a/src/main/java/org/scijava/script/ScriptFinder.java +++ b/src/main/java/org/scijava/script/ScriptFinder.java @@ -94,7 +94,7 @@ public void findScripts(final List scripts) { discoverScripts(scripts, scriptFiles, directory, menuPath); } - log.info("Found " + scriptCount + " scripts"); + log.debug("Found " + scriptCount + " scripts"); } // -- Helper methods -- diff --git a/src/main/java/org/scijava/ui/DefaultUIService.java b/src/main/java/org/scijava/ui/DefaultUIService.java index d66eeed95..ac576b86f 100644 --- a/src/main/java/org/scijava/ui/DefaultUIService.java +++ b/src/main/java/org/scijava/ui/DefaultUIService.java @@ -176,7 +176,7 @@ public void showUI(final String name) { @Override public void showUI(final UserInterface ui) { - log.info("Launching user interface: " + ui.getClass().getName()); + log.debug("Launching user interface: " + ui.getClass().getName()); ui.show(); // NB: Also show all the current displays. for (final Display display : displayService.getDisplays()) { @@ -499,7 +499,7 @@ private synchronized void discoverUIs() { // instantiate user interface final UserInterface ui = pluginService.createInstance(info); if (ui == null) continue; - log.info("Discovered user interface: " + ui.getClass().getName()); + log.debug("Discovered user interface: " + ui.getClass().getName()); addUserInterface(info.getName(), ui); } From 4e45f814ebc616bcf7585a7ac4681cc36a96b478 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 19 Dec 2014 13:52:19 -0600 Subject: [PATCH 2/2] ScriptFinder: change warn to debug Having this as a WARN-level log statement is overly aggressive. No exceptions were thrown, and skipping a non-existant directory is expected behavior, thus this statement is downgraded to DEBUG-level. --- src/main/java/org/scijava/script/ScriptFinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/scijava/script/ScriptFinder.java b/src/main/java/org/scijava/script/ScriptFinder.java index c3bb8d3cc..43715545d 100644 --- a/src/main/java/org/scijava/script/ScriptFinder.java +++ b/src/main/java/org/scijava/script/ScriptFinder.java @@ -84,7 +84,7 @@ public void findScripts(final List scripts) { final HashSet scriptFiles = new HashSet(); for (final File directory : directories) { if (!directory.exists()) { - log.warn("Ignoring non-existent scripts directory: " + + log.debug("Ignoring non-existent scripts directory: " + directory.getAbsolutePath()); continue; }