Merge pull request #77 from reactivegroup/feature/metrics

upgrade logback version
capa-cloud · Dec 7, 2021 · da82340 · da82340
2 parents f10b608 + e873b73
commit da82340
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 28 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-examples</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
         <log4j.version>2.14.1</log4j.version>
-        <logback.version>1.1.7</logback.version>
+        <logback.version>1.2.3</logback.version>
         <slf4j-api.version>1.7.32</slf4j-api.version>
     </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>group.rxcloud</groupId>
     <artifactId>capa-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.9.RELEASE</version>
+    <version>1.10.9.2.RELEASE</version>
     <name>capa-sdk-parent</name>
     <description>SDK for Capa.</description>
     <url>https://github.com/reactivegroup</url>

diff --git a/sdk-component/pom.xml b/sdk-component/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-component</artifactId>
@@ -34,7 +34,7 @@
         <okhttp.version>4.9.1</okhttp.version>
         <kotlin-stdlib.version>1.4.10</kotlin-stdlib.version>
         <log4j.version>2.14.1</log4j.version>
-        <logback.version>1.1.7</logback.version>
+        <logback.version>1.2.3</logback.version>
      </properties>
 
     <dependencies>

diff --git a/sdk-infrastructure/pom.xml b/sdk-infrastructure/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-infrastructure</artifactId>

diff --git a/sdk-spi-demo/pom.xml b/sdk-spi-demo/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-spi-demo</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
         <log4j.version>2.14.1</log4j.version>
-        <logback.version>1.1.7</logback.version>
+        <logback.version>1.2.3</logback.version>
     </properties>
 
     <dependencies>

diff --git a/sdk-spi-demo/src/main/resources/capa-component-log-common.properties b/sdk-spi-demo/src/main/resources/capa-component-log-common.properties
@@ -0,0 +1 @@
+LOG_COMPONENT_CENTER_CONFIG_APPID=100035464
diff --git a/sdk-spi/pom.xml b/sdk-spi/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk-spi</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
         <log4j.version>2.14.1</log4j.version>
-        <logback.version>1.1.7</logback.version>
+        <logback.version>1.2.3</logback.version>
     </properties>
 
     <dependencies>

diff --git a/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java b/sdk-spi/src/main/java/group/rxcloud/capa/spi/log/manager/LogManager.java
@@ -79,36 +79,36 @@ public static Boolean whetherLogsCanOutput(CapaLogLevel capaLogLevel) {
         switch (capaLogLevel) {
             case ALL:
                 return LogConfiguration.containsKey(ALL_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(ALL_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(ALL_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case TRACE:
                 return LogConfiguration.containsKey(TRACE_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(TRACE_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(TRACE_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case DEBUG:
                 return LogConfiguration.containsKey(DEBUG_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(DEBUG_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(DEBUG_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case INFO:
                 return LogConfiguration.containsKey(INFO_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(INFO_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(INFO_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case WARN:
                 return LogConfiguration.containsKey(WARN_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(WARN_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(WARN_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case ERROR:
                 return LogConfiguration.containsKey(ERROR_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(ERROR_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(ERROR_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case FATAL:
                 return LogConfiguration.containsKey(FATAL_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(FATAL_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(FATAL_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             case OFF:
                 return LogConfiguration.containsKey(OFF_LEVEL_SWITCH_NAME)
-                        ? Boolean.FALSE
-                        : Boolean.parseBoolean(LogConfiguration.get(OFF_LEVEL_SWITCH_NAME));
+                        ? Boolean.parseBoolean(LogConfiguration.get(OFF_LEVEL_SWITCH_NAME))
+                        : Boolean.FALSE;
             default:
                 return Boolean.FALSE;
         }

diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>capa-parent</artifactId>
         <groupId>group.rxcloud</groupId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>sdk-springboot</artifactId>

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>group.rxcloud</groupId>
         <artifactId>capa-parent</artifactId>
-        <version>1.0.9.RELEASE</version>
+        <version>1.10.9.2.RELEASE</version>
     </parent>
 
     <artifactId>capa-sdk</artifactId>