Merge pull request #851 from ebocher/logger_pb

Fix logger info
orbisgis · Oct 5, 2023 · b858e91 · b858e91
2 parents 85f04b8 + d890e81
commit b858e91
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 86 deletions.
diff --git a/bdtopo/pom.xml b/bdtopo/pom.xml
@@ -59,10 +59,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/BDTopoUtils.groovy b/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/BDTopoUtils.groovy
@@ -23,7 +23,6 @@ package org.orbisgis.geoclimate.bdtopo
 import org.locationtech.jts.geom.Envelope
 import org.locationtech.jts.geom.Geometry
 import org.orbisgis.geoclimate.utils.AbstractScript
-import org.orbisgis.geoclimate.utils.LoggerUtils
 
 /**
  * BDTopo utils

diff --git a/common-utils/pom.xml b/common-utils/pom.xml
@@ -15,6 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <logback-version>1.4.11</logback-version>
     </properties>
 
     <dependencies>
@@ -23,9 +24,14 @@
             <artifactId>groovy</artifactId>
             <version>${groovy-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
+            <version>${logback-version}</version>
         </dependency>
     </dependencies>
 

diff --git a/common-utils/src/main/groovy/org/orbisgis/geoclimate/utils/AbstractScript.groovy b/common-utils/src/main/groovy/org/orbisgis/geoclimate/utils/AbstractScript.groovy
@@ -1,22 +1,21 @@
 package org.orbisgis.geoclimate.utils
 
-import ch.qos.logback.classic.Logger
-import ch.qos.logback.classic.LoggerContext
+import org.slf4j.Logger
 
 abstract class AbstractScript extends Script {
 
     public Logger logger
 
+
     AbstractScript(Class aClass) {
-        LoggerContext context = new LoggerContext()
-        this.logger = context.getLogger(aClass)
-        LoggerUtils.setLoggerLevel("INFO")
+        this.logger = org.slf4j.LoggerFactory.getLogger(aClass.toString())
     }
 
+
     static String uuid() { UUID.randomUUID().toString().replaceAll("-", "_") }
 
     void info(def message) {
-        logger.info(message.toString())
+        logger.info( message.toString())
     }
 
     void warn(def message) {

diff --git a/common-utils/src/main/groovy/org/orbisgis/geoclimate/utils/LoggerUtils.groovy b/common-utils/src/main/groovy/org/orbisgis/geoclimate/utils/LoggerUtils.groovy
@@ -1,12 +1,11 @@
 package org.orbisgis.geoclimate.utils
 
 import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.LoggerContext
 import org.slf4j.LoggerFactory
 
-class LoggerUtils {
 
+class LoggerUtils {
 
 
     /**
@@ -27,22 +26,9 @@ class LoggerUtils {
             } else {
                 throw new RuntimeException("Invalid log level. Allowed values are : INFO, DEBUG, TRACE, OFF")
             }
-            var logFac =  LoggerFactory.getILoggerFactory()
-            if(logFac instanceof  LoggerContext){
-                var context = (LoggerContext) LoggerFactory.getILoggerFactory()
-                context.getLoggerList().each { it -> it.setLevel(level) }
-            }
+            var context = (LoggerContext) LoggerFactory.getILoggerFactory()
+            context.getLoggerList().each { it -> it.setLevel(level) }
         }
     }
 
-
-    /**
-     * Create a logback logger
-     * @param aClass
-     * @return
-     */
-    static Logger createLogger(Class aClass){
-        LoggerContext context = new LoggerContext()
-        return context.getLogger(aClass)
-    }
 }
diff --git a/geoclimate/pom.xml b/geoclimate/pom.xml
@@ -85,14 +85,14 @@
             <groupId>org.orbisgis.geoclimate</groupId>
             <artifactId>osmtools</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.9</version>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/geoclimate/src/test/groovy/org/orbisgis/geoclimate/GeoclimateTest.groovy b/geoclimate/src/test/groovy/org/orbisgis/geoclimate/GeoclimateTest.groovy
@@ -98,7 +98,7 @@ class GeoclimateTest {
         def cmd = new CommandLine(app)
         def sw = new StringWriter()
         cmd.setOut(new PrintWriter(sw))
-        def exitCode = cmd.execute("-w osm", "-f $configFile", "-l info")
+        def exitCode = cmd.execute("-w osm", "-f $configFile", "-l OFF")
         assert 0 == exitCode
     }
 

diff --git a/geoindicators/pom.xml b/geoindicators/pom.xml
@@ -54,14 +54,6 @@
             <artifactId>xstream</artifactId>
             <version>1.4.19</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-json</artifactId>
@@ -76,6 +68,10 @@
             <groupId>org.orbisgis.geoclimate</groupId>
             <artifactId>common-utils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy
@@ -19,8 +19,6 @@
  */
 package org.orbisgis.geoclimate.geoindicators
 
-import ch.qos.logback.classic.Level
-import ch.qos.logback.classic.LoggerContext
 import groovy.json.JsonSlurper
 import groovy.transform.BaseScript
 import org.h2gis.functions.io.utility.PRJUtil

diff --git a/...rs/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy b/...rs/src/test/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicatorsTest.groovy
@@ -19,14 +19,14 @@
  */
 package org.orbisgis.geoclimate.geoindicators
 
-import ch.qos.logback.classic.Logger
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import org.orbisgis.data.H2GIS
 import org.orbisgis.data.dataframe.DataFrame
 import org.orbisgis.geoclimate.Geoindicators
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static org.junit.jupiter.api.Assertions.*
 import static org.orbisgis.data.H2GIS.open
@@ -36,7 +36,7 @@ class WorkflowGeoIndicatorsTest {
     @TempDir
     static File folder
 
-    public static Logger logger = LoggerUtils.createLogger(WorkflowGeoIndicatorsTest.class)
+    public static Logger logger = LoggerFactory.getLogger(WorkflowGeoIndicatorsTest.class)
 
     // Indicator list (at RSU scale) for each type of use
     public static listNames = [

diff --git a/osm/pom.xml b/osm/pom.xml
@@ -55,18 +55,15 @@
             <artifactId>geoindicators</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.orbisgis.geoclimate</groupId>
             <artifactId>common-utils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/OSM.groovy
@@ -23,7 +23,6 @@ import org.locationtech.jts.geom.Envelope
 import org.locationtech.jts.geom.Geometry
 import org.orbisgis.geoclimate.osmtools.utils.Utilities
 import org.orbisgis.geoclimate.utils.AbstractScript
-import org.orbisgis.geoclimate.utils.LoggerUtils
 
 /**
  * Main class to access to the OSM processes

diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy
@@ -29,8 +29,7 @@ import org.junit.jupiter.api.io.TempDir
 import org.orbisgis.data.H2GIS
 import org.orbisgis.data.POSTGIS
 import org.orbisgis.geoclimate.Geoindicators
-import org.orbisgis.geoclimate.osmtools.OSMTools
-import org.orbisgis.geoclimate.osmtools.utils.Utilities
+import org.orbisgis.geoclimate.utils.LoggerUtils
 
 import static org.junit.jupiter.api.Assertions.*
 
@@ -647,6 +646,7 @@ class WorflowOSMTest extends WorkflowAbstractTest {
     //Use it for debug
     @Test
     void testIntegration() {
+
         String directory = "/tmp/geoclimate"
         File dirFile = new File(directory)
         dirFile.delete()

diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorkflowAbstractTest.groovy
@@ -19,15 +19,15 @@
  */
 package org.orbisgis.geoclimate.osm
 
-import ch.qos.logback.classic.Logger
 import org.orbisgis.geoclimate.Geoindicators
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static org.junit.jupiter.api.Assertions.*
 
 class WorkflowAbstractTest {
 
-    public static Logger logger = LoggerUtils.createLogger(WorkflowAbstractTest.class)
+    public static Logger logger = LoggerFactory.getLogger(WorkflowAbstractTest.class)
 
     /**
      * A method to compute geomorphological indicators

diff --git a/osmtools/pom.xml b/osmtools/pom.xml
@@ -48,10 +48,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
 
         <!-- Test dependencies -->
         <dependency>

diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/OSMTools.groovy
@@ -24,7 +24,6 @@ import org.orbisgis.geoclimate.osmtools.Transform as TRANSFORM
 import org.orbisgis.geoclimate.osmtools.utils.TransformUtils as TRANSFORM_UTILS
 import org.orbisgis.geoclimate.osmtools.utils.Utilities as UTILITIES
 import org.orbisgis.geoclimate.utils.AbstractScript
-import org.orbisgis.geoclimate.utils.LoggerUtils
 
 /**
  * Main script to access to all processes used to extract, transform and save OSM data as GIS layers.

diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/LoaderTest.groovy
@@ -19,15 +19,15 @@
  */
 package org.orbisgis.geoclimate.osmtools
 
-import ch.qos.logback.classic.Logger
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.io.TempDir
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.GeometryFactory
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.osmtools.utils.OSMElement
 import org.orbisgis.geoclimate.osmtools.utils.Utilities
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import java.util.regex.Pattern
 
@@ -44,7 +44,7 @@ class LoaderTest extends AbstractOSMToolsTest {
     @TempDir
     static File folder
 
-    private static final Logger LOGGER = LoggerUtils.createLogger(LoaderTest)
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoaderTest)
 
     static H2GIS ds
 

diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/TransformTest.groovy
@@ -19,15 +19,15 @@
  */
 package org.orbisgis.geoclimate.osmtools
 
-import ch.qos.logback.classic.Logger
 import org.h2gis.utilities.GeographyUtilities
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.io.TempDir
 import org.locationtech.jts.geom.*
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.osmtools.utils.OSMElement
 import org.orbisgis.geoclimate.osmtools.utils.Utilities
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static org.junit.jupiter.api.Assertions.*
 
@@ -42,7 +42,7 @@ class TransformTest extends AbstractOSMToolsTest {
     @TempDir
     static File folder
 
-    private static final Logger LOGGER = LoggerUtils.createLogger(TransformTest)
+    private static final Logger LOGGER = LoggerFactory.getLogger(TransformTest)
 
     static H2GIS ds
 

diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/TransformUtilsTest.groovy
@@ -19,7 +19,6 @@
  */
 package org.orbisgis.geoclimate.osmtools.utils
 
-import ch.qos.logback.classic.Logger
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
@@ -28,7 +27,8 @@ import org.locationtech.jts.geom.MultiLineString
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.osmtools.AbstractOSMToolsTest
 import org.orbisgis.geoclimate.osmtools.OSMTools
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import static org.junit.jupiter.api.Assertions.*
 
@@ -43,7 +43,7 @@ class TransformUtilsTest extends AbstractOSMToolsTest {
     @TempDir(cleanup = CleanupMode.ON_SUCCESS)
     static File folder
 
-    private static final Logger LOGGER = LoggerUtils.createLogger(TransformUtilsTest)
+    private static final Logger LOGGER = LoggerFactory.getLogger(TransformUtilsTest)
 
     static H2GIS h2gis
 

diff --git a/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy b/osmtools/src/test/groovy/org/orbisgis/geoclimate/osmtools/utils/UtilitiesTest.groovy
@@ -19,7 +19,6 @@
  */
 package org.orbisgis.geoclimate.osmtools.utils
 
-import ch.qos.logback.classic.Logger
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.io.CleanupMode
 import org.junit.jupiter.api.io.TempDir
@@ -30,7 +29,8 @@ import org.locationtech.jts.geom.Polygon
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.osmtools.AbstractOSMToolsTest
 import org.orbisgis.geoclimate.osmtools.OSMTools
-import org.orbisgis.geoclimate.utils.LoggerUtils
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import java.util.regex.Pattern
 
@@ -47,7 +47,7 @@ class UtilitiesTest extends AbstractOSMToolsTest {
     @TempDir(cleanup = CleanupMode.ON_SUCCESS)
     static File folder
 
-    private static final Logger LOGGER = LoggerUtils.createLogger(UtilitiesTest)
+    private static final Logger LOGGER = LoggerFactory.getLogger(UtilitiesTest)
 
     /** Used to store method pointer in order to replace it for the tests to avoid call to Overpass servers. */
     private static def executeOverPassQuery