Merge pull request #2234 from zebrunner/develop

1.1.5
zebrunner · Sep 11, 2023 · ffc5c83 · ffc5c83
2 parents c7722d0 + 517b2e6
commit ffc5c83
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
-        <carina-webdriver.version>1.1.6</carina-webdriver.version>
+        <carina-webdriver.version>1.1.7</carina-webdriver.version>
         <!-- Logging -->
         <slf4j.version>1.7.30</slf4j.version>
         <log4j.version>2.17.1</log4j.version>

diff --git a/src/main/java/com/zebrunner/carina/core/listeners/CarinaListener.java b/src/main/java/com/zebrunner/carina/core/listeners/CarinaListener.java
@@ -147,8 +147,15 @@ public CarinaListener() {
             org.apache.logging.log4j.core.config.Configuration config = ctx.getConfiguration();
             LoggerConfig logger = config.getLoggerConfig("com.zebrunner.carina.core");
             logger.setLevel(Level.getLevel(Configuration.getRequired(ReportConfiguration.Parameter.CORE_LOG_LEVEL)));
-        }
 
+            if ("DEBUG".equalsIgnoreCase(Configuration.getRequired(ReportConfiguration.Parameter.CORE_LOG_LEVEL))) {
+                config.getLoggerConfig("io.netty")
+                        .setLevel(Level.OFF);
+                config.getLoggerConfig("org.asynchttpclient.netty")
+                        .setLevel(Level.OFF);
+            }
+        }
+
         try {
             L10N.load();
         } catch (Exception e) {
@@ -214,6 +221,10 @@ public void onStart(ISuite suite) {
 
         // register owner of the run
         registerOwner();
+
+        // register branch if available
+        Configuration.get("branch")
+                .ifPresent(branch -> Label.attachToTestRun("Branch", branch));
 
         /*
          * To support multi-suite declaration as below we have to init test run labels at once only!

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -21,3 +21,6 @@ retry_count=0
 thread_count=-1
 data_provider_thread_count=-1
 test_run_rules=NULL
+#============ Other Parameters ==============#
+#Note: this parameters should not be added to the Configuration classes
+branch=NULL
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -16,12 +16,22 @@
       </ReportingAppender>
    </appenders>
    <loggers>
-      <!-- there are a lot of useless warnings from Reflections -->
+      <!-- there are a lot of useless logs from Reflections -->
       <logger name="org.reflections" level="WARN" additivity="false">
          <appender-ref ref="Console"/>
          <appender-ref ref="ThreadLogAppender"/>
          <appender-ref ref="ReportingAppender"/>
       </logger>
+      <logger name="io.netty" additivity="false">
+         <appender-ref ref="Console"/>
+         <appender-ref ref="ThreadLogAppender"/>
+         <appender-ref ref="ReportingAppender"/>
+      </logger>
+      <logger name="org.asynchttpclient.netty" additivity="false">
+         <appender-ref ref="Console"/>
+         <appender-ref ref="ThreadLogAppender"/>
+         <appender-ref ref="ReportingAppender"/>
+      </logger>
       <root level="info">
          <appender-ref ref="Console"/>
          <appender-ref ref="ThreadLogAppender"/>