Bugfix: if use use the same naming of logger, the output of the first…

… logger would be dismissed (#581) * Bugfix: if use use the same naming of logger, the output of the first logger would be dismissed * Update PreInstallListener.java
microsoft · Aug 23, 2023 · dc67084 · dc67084
1 parent bc69a7f
commit dc67084
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/agent/src/main/resources/logback-common.xml b/agent/src/main/resources/logback-common.xml
@@ -46,6 +46,9 @@
     </appender>
 
     <appender name ="asyncAlarm" class= "ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${logging.console.level:-WARN}</level>
+        </filter>
         <discardingThreshold >20</discardingThreshold>
         <queueSize>256</queueSize>
         <neverBlock>true</neverBlock>
@@ -62,16 +65,12 @@
     <logger name="com.microsoft" level="debug" additivity="false">
         <appender-ref ref="syslog"/>
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="asyncAlarm"/>
     </logger>
     <logger name="logger.devices" level="debug" additivity="false">
     </logger>
     <logger name="access" level="info" additivity="false">
         <appender-ref ref="accessLog"/>
-    </logger>
-    <logger name="com.microsoft" level="warn" additivity="false">
-        <appender-ref ref="asyncAlarm"/>
-    </logger>
-    <logger name="access" level="warn" additivity="false">
         <appender-ref ref="asyncAlarm"/>
     </logger>
 </configuration>
diff --git a/center/src/main/resources/logback-common.xml b/center/src/main/resources/logback-common.xml
@@ -46,6 +46,9 @@
     </appender>
 
     <appender name ="asyncAlarm" class= "ch.qos.logback.classic.AsyncAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${logging.console.level:-WARN}</level>
+        </filter>
         <discardingThreshold >20</discardingThreshold>
         <queueSize>256</queueSize>
         <neverBlock>true</neverBlock>
@@ -62,16 +65,12 @@
     <logger name="com.microsoft" level="debug" additivity="false">
         <appender-ref ref="syslog"/>
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="asyncAlarm"/>
     </logger>
     <logger name="logger.devices" level="debug" additivity="false">
     </logger>
     <logger name="access" level="info" additivity="false">
         <appender-ref ref="accessLog"/>
-    </logger>
-    <logger name="com.microsoft" level="warn" additivity="false">
-        <appender-ref ref="asyncAlarm"/>
-    </logger>
-    <logger name="access" level="warn" additivity="false">
         <appender-ref ref="asyncAlarm"/>
     </logger>
 </configuration>
diff --git a/.../main/java/com/microsoft/hydralab/common/management/listener/impl/PreInstallListener.java b/.../main/java/com/microsoft/hydralab/common/management/listener/impl/PreInstallListener.java
@@ -49,13 +49,13 @@ public void onDeviceConnected(DeviceInfo deviceInfo) {
             if (!appFile.isFile()) {
                 continue;
             }
-            try {
-                // install app
-                deviceDriverManager.installApp(deviceInfo, appFile.getAbsolutePath(), classLogger);
+
+            // install app
+            if (deviceDriverManager.installApp(deviceInfo, appFile.getAbsolutePath(), classLogger)) {
                 classLogger.info("Pre-Install {} successfully", appFile.getAbsolutePath());
-            } catch (Exception e) {
+            } else {
                 String errorMessage = String.format("Pre-Install %s failed", appFile.getAbsolutePath());
-                classLogger.error(errorMessage, e);
+                classLogger.warn(errorMessage);
                 try {
                     FlowUtil.retryAndSleepWhenFalse(3, 10, () -> {
                         // try to uninstall app first
@@ -64,17 +64,17 @@ public void onDeviceConnected(DeviceInfo deviceInfo) {
                             if (!StringUtils.isEmpty(res.getString(StorageFileInfo.ParserKey.PKG_NAME))) {
                                 deviceDriverManager.uninstallApp(deviceInfo, res.getString(StorageFileInfo.ParserKey.PKG_NAME), classLogger);
                             }
-                        } catch (Exception e1) {
+                        } catch (Exception e) {
                             classLogger.warn("Uninstall origin app of {} failed", appFile.getName(), e);
                         }
                         // install app
                         return deviceDriverManager.installApp(deviceInfo, appFile.getAbsolutePath(), classLogger);
                     });
-                } catch (Exception e2) {
-                    classLogger.warn("Uninstall origin app of {} failed", appFile.getName(), e2);
+                } catch (Exception e1) {
+                    classLogger.warn("Uninstall origin app of {} failed", appFile.getName(), e1);
                     if (Const.PreInstallFailurePolicy.SHUTDOWN.equals(
                             agentManagementService.getPreInstallFailurePolicy())) {
-                        throw new HydraLabRuntimeException(HttpStatus.INTERNAL_SERVER_ERROR.value(), errorMessage, e2);
+                        throw new HydraLabRuntimeException(HttpStatus.INTERNAL_SERVER_ERROR.value(), errorMessage, e1);
                     }
                 }
             }