[refator] Change extraneous log messages to debug level

Author: adamretter

exist-core/pom.xml

@@ -825,6 +825,8 @@
                                 <include>src/main/java/org/exist/http/Descriptor.java</include>
                                 <include>src/main/java/org/exist/http/RESTServer.java</include>
                                 <include>src/test/java/org/exist/http/RESTServiceTest.java</include>
+                                <include>src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java</include>
+                                <include>src/main/java/org/exist/http/servlets/XQueryServlet.java</include>
                                 <include>src/main/java/org/exist/http/servlets/XSLTServlet.java</include>
                                 <include>src/main/java/org/exist/http/urlrewrite/ModuleCall.java</include>
                                 <include>src/main/java/org/exist/http/urlrewrite/PathForward.java</include>
@@ -1161,6 +1163,8 @@
                                 <exclude>src/main/java/org/exist/http/Descriptor.java</exclude>
                                 <exclude>src/main/java/org/exist/http/RESTServer.java</exclude>
                                 <exclude>src/test/java/org/exist/http/RESTServiceTest.java</exclude>
+                                <exclude>src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java</exclude>
+                                <exclude>src/main/java/org/exist/http/servlets/XQueryServlet.java</exclude>
                                 <exclude>src/main/java/org/exist/http/servlets/XSLTServlet.java</exclude>
                                 <exclude>src/main/java/org/exist/http/urlrewrite/ModuleCall.java</exclude>
                                 <exclude>src/main/java/org/exist/http/urlrewrite/PathForward.java</exclude>

exist-core/src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -98,7 +122,9 @@ private BrokerPool getOrCreateBrokerPool(final ServletConfig config) throws EXis
 
         // Configure BrokerPool
         if(BrokerPool.isConfigured()) {
-            getLog().info("Database already started. Skipping configuration ...");
+            if (getLog().isDebugEnabled()) {
+                getLog().debug("Database already started. Skipping configuration ...");
+            }
         } else {
             final String confFile = Optional.ofNullable(config.getInitParameter("configuration")).orElse("conf.xml");
 
@@ -186,9 +212,11 @@ private void doGeneralExistServletConfig(ServletConfig config) {
             }
 
             if (getDefaultUser() != null) {
-                getLog().info("Using default user {} for all unauthorized requests.", getDefaultUsername());
+                if (getLog().isDebugEnabled()) {
+                    getLog().debug("Using default user '{}' for all unauthorized requests.", getDefaultUsername());
+                }
             } else {
-                getLog().error("Default user {} cannot be found.  A BASIC AUTH challenge will be the default.", getDefaultUsername());
+                getLog().warn("Default user '{}' cannot be found.  A BASIC AUTH challenge will be the default.", getDefaultUsername());
             }
         } else {
             getLog().info("No default user.  All requires must be authorized or will result in a BASIC AUTH challenge.");

exist-core/src/main/java/org/exist/http/servlets/XQueryServlet.java

@@ -1,4 +1,28 @@
 /*
+ * Elemental
+ * Copyright (C) 2024, Evolved Binary Ltd
+ *
+ * [email protected]
+ * https://www.evolvedbinary.com | https://www.elemental.xyz
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * NOTE: Parts of this file contain code from 'The eXist-db Authors'.
+ *       The original license header is included below.
+ *
+ * =====================================================================
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -144,7 +168,9 @@ public void init(ServletConfig config) throws ServletException {
         if(encoding == null) {
             encoding = DEFAULT_ENCODING;
         }
-        getLog().info("encoding = {}", encoding);
+        if (getLog().isDebugEnabled()) {
+            getLog().debug("encoding = {}", encoding);
+        }
 
         contentType = config.getInitParameter("content-type");
         if(contentType == null) {

exist-core/src/main/java/org/exist/jetty/JettyStart.java

@@ -202,7 +202,9 @@ public synchronized void run(final String[] args, final Observer observer) {
                 addObserver(observer);
             }
 
-            logger.info("Running with Java {} [{} ({}) in {}]",
+            logger.info("Operating System: {} {} {}]", System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"));
+            logger.info("Running as user: {}", System.getProperty("user.name", "(unknown user.name)"));
+            logger.info("Using Java: {} [{} ({}) in {}]",
                 System.getProperty("java.version", "(unknown java.version)"),
                 System.getProperty("java.vendor", "(unknown java.vendor)"),
                 System.getProperty("java.vm.name", "(unknown java.vm.name)"),
@@ -212,19 +214,11 @@ public synchronized void run(final String[] args, final Observer observer) {
             logger.info("Approximate maximum amount of memory for JVM: {}", FileUtils.humanSize(Runtime.getRuntime().maxMemory()));
             logger.info("Number of processors available to JVM: {}", Runtime.getRuntime().availableProcessors());
 
-            logger.info("Running as user '{}'", System.getProperty("user.name", "(unknown user.name)"));
-            logger.info("[Elemental Home : {}]", System.getProperty("exist.home", "unknown"));
-            logger.info("[Elemental Version : {}]", SystemProperties.getInstance().getSystemProperty("product-version", "unknown"));
-            logger.info("[Elemental Build : {}]", SystemProperties.getInstance().getSystemProperty("product-build", "unknown"));
-            logger.info("[Git commit : {}]", SystemProperties.getInstance().getSystemProperty("git-commit", "unknown"));
-            logger.info("[Git commit timestamp : {}]", SystemProperties.getInstance().getSystemProperty("git-commit-timestamp", "unknown"));
-
-            logger.info("[Operating System : {} {} {}]", System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"));
-            logger.info("[log4j.configurationFile : {}]", System.getProperty("log4j.configurationFile"));
-            logger.info("[jetty Version: {}]", Jetty.VERSION);
-            logger.info("[{} : {}]", JETTY_HOME_PROP, configProperties.get(JETTY_HOME_PROP));
-            logger.info("[{} : {}]", JETTY_BASE_PROP, configProperties.get(JETTY_BASE_PROP));
-            logger.info("[jetty configuration : {}]", jettyConfig.toAbsolutePath().toString());
+            logger.info("[Elemental Version: {}]", SystemProperties.getInstance().getSystemProperty("product-version", "unknown"));
+            logger.info("[Elemental Build: {}]", SystemProperties.getInstance().getSystemProperty("product-build", "unknown"));
+            logger.info("[Elemental Git commit: {}]", SystemProperties.getInstance().getSystemProperty("git-commit", "unknown"));
+            logger.info("[Elemental Git commit timestamp: {}]", SystemProperties.getInstance().getSystemProperty("git-commit-timestamp", "unknown"));
+            logger.info("[Elemental Home: {}]", System.getProperty("exist.home", "unknown"));
 
             // configure the database instance
             SingleInstanceConfiguration config;
@@ -233,10 +227,16 @@ public synchronized void run(final String[] args, final Observer observer) {
             } else {
                 config = new SingleInstanceConfiguration();
             }
-            logger.info("Configuring Elemental from {}",
-                    config.getConfigFilePath()
-                        .map(Path::normalize).map(Path::toAbsolutePath).map(Path::toString)
-                        .orElse("<UNKNOWN>"));
+            final String elementalConfigPath = config.getConfigFilePath()
+                .map(Path::normalize).map(Path::toAbsolutePath).map(Path::toString)
+                .orElse("<UNKNOWN>");
+            logger.info("[Elemental Configuration: {}]", elementalConfigPath);
+
+            logger.info("[Log4j Configuration: {}]", System.getProperty("log4j.configurationFile"));
+            logger.info("[Jetty Version: {}]", Jetty.VERSION);
+            logger.info("[Jetty Home: {}]", configProperties.get(JETTY_HOME_PROP));
+            logger.info("[Jetty Base: {}]", configProperties.get(JETTY_BASE_PROP));
+            logger.info("[Jetty Configuration: {}]", jettyConfig.toAbsolutePath().toString());
 
             BrokerPool.configure(1, 5, config, Optional.ofNullable(observer));
 
@@ -257,7 +257,9 @@ public synchronized void run(final String[] args, final Observer observer) {
             final List<Object> configuredObjects = new ArrayList<>();
             XmlConfiguration last = null;
             for(final Path confFile : configFiles) {
-                logger.info("[loading jetty configuration : {}]", confFile.toString());
+                if (logger.isDebugEnabled()) {
+                    logger.debug("[Loading Jetty Configuration: {}]", confFile.toString());
+                }
                 try(final InputStream is = Files.newInputStream(confFile)) {
                     final XmlConfiguration configuration = new XmlConfiguration(is);
                     if (last != null) {
@@ -486,7 +488,9 @@ private Optional<Server> startJetty(final List<Object> configuredObjects) throws
 
                 try {
                     Runtime.getRuntime().addShutdownHook(shutdownHookThread);
-                    logger.debug("BrokerPoolsAndJetty.ShutdownHook hook registered");
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("BrokerPoolsAndJetty.ShutdownHook hook registered");
+                    }
                 } catch (final IllegalArgumentException | IllegalStateException e) {
                     // Hook already registered, or Shutdown in progress
                     logger.error("Unable to add BrokerPoolsAndJetty.ShutdownHook hook: {}", e.getMessage(), e);
@@ -499,7 +503,9 @@ private Optional<Server> startJetty(final List<Object> configuredObjects) throws
             if (configuredObject instanceof LifeCycle) {
                 final LifeCycle lc = (LifeCycle)configuredObject;
                 if (!lc.isRunning()) {
-                    logger.info("[Starting jetty component : {}]", lc.getClass().getName());
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("[Starting Jetty Component : {}]", lc.getClass().getName());
+                    }
                     lc.start();
                 }
             }
@@ -561,7 +567,9 @@ public synchronized void shutdown() {
         shutdownHookThread.ifPresent(thread -> {
             try {
                 Runtime.getRuntime().removeShutdownHook(thread);
-                logger.debug("BrokerPoolsAndJetty.ShutdownHook hook unregistered");
+                if (logger.isDebugEnabled()) {
+                    logger.debug("BrokerPoolsAndJetty.ShutdownHook hook unregistered");
+                }
             } catch (final IllegalStateException e) {
                 // Shutdown in progress
                 logger.warn("Unable to remove BrokerPoolsAndJetty.ShutdownHook hook: {}", e.getMessage());
@@ -656,7 +664,9 @@ public synchronized boolean isStarted() {
 
     @Override
     public synchronized void lifeCycleStarting(final LifeCycle lifeCycle) {
-        logger.info("Jetty server starting...");
+        if (logger.isDebugEnabled()) {
+            logger.debug("Jetty server starting...");
+        }
         setChanged();
         notifyObservers(SIGNAL_STARTING);
         status = STATUS_STARTING;
@@ -665,7 +675,9 @@ public synchronized void lifeCycleStarting(final LifeCycle lifeCycle) {
 
     @Override
     public synchronized void lifeCycleStarted(final LifeCycle lifeCycle) {
-        logger.info("Jetty server started.");
+        if (logger.isDebugEnabled()) {
+            logger.debug("Jetty server started.");
+        }
         setChanged();
         notifyObservers(SIGNAL_STARTED);
         status = STATUS_STARTED;
@@ -678,14 +690,18 @@ public void lifeCycleFailure(final LifeCycle lifeCycle, final Throwable throwabl
 
     @Override
     public synchronized void lifeCycleStopping(final LifeCycle lifeCycle) {
-        logger.info("Jetty server stopping...");
+        if (logger.isDebugEnabled()) {
+            logger.debug("Jetty server stopping...");
+        }
         status = STATUS_STOPPING;
         notifyAll();
     }
 
     @Override
     public synchronized void lifeCycleStopped(final LifeCycle lifeCycle) {
-        logger.info("Jetty server stopped");
+        if (logger.isDebugEnabled()) {
+            logger.debug("Jetty server stopped");
+        }
         status = STATUS_STOPPED;
         notifyAll();
     }