Merge pull request #45 from telekom/improvements/session-logging

Improvements/session logging
telekom · May 5, 2021 · f1957cc · f1957cc
2 parents 8bdf364 + faf71bf
commit f1957cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TesterraListener.java b/core/src/main/java/eu/tsystems/mms/tic/testframework/report/TesterraListener.java
@@ -51,6 +51,8 @@
 import eu.tsystems.mms.tic.testframework.report.model.steps.TestStep;
 import eu.tsystems.mms.tic.testframework.report.utils.DefaultTestNGContextGenerator;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
+import java.util.Locale;
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.logging.log4j.core.config.DefaultConfiguration;
@@ -110,6 +112,11 @@ public class TesterraListener implements
     private static DefaultTestNGContextGenerator contextGenerator;
 
     static {
+        String logLevel = PropertyManager.getProperty("log4j.level");
+        if (logLevel != null) {
+            Level desiredLogLevel = Level.valueOf(logLevel.trim().toUpperCase(Locale.ROOT));
+            Configurator.setRootLevel(desiredLogLevel);
+        }
         DefaultConfiguration defaultConfiguration = new DefaultConfiguration();
         loggerContext = Configurator.initialize(defaultConfiguration);
         buildInformation = new BuildInformation();

diff --git a/docs/src/docs/gettingstarted/logging.adoc b/docs/src/docs/gettingstarted/logging.adoc
@@ -8,3 +8,9 @@ If you want to have more control over several log levels of classes, add a `log4
 ----
 include::../../res/log4j2.xml[]
 ----
+
+You can also change the root log level from the command line via.
+[source, bash]
+----
+-Dlog4j.level=DEBUG
+----
diff --git a/...ain/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java b/...ain/java/eu/tsystems/mms/tic/testframework/webdrivermanager/WebDriverSessionsManager.java
@@ -109,6 +109,8 @@ static void storeWebDriverSession(AbstractWebDriverRequest webDriverRequest, Web
     }
 
     private static void unlinkFromThread(String sessionKey, WebDriver eventFiringWebDriver) {
+        final String sessionIdentifier = createSessionIdentifier(eventFiringWebDriver, sessionKey);
+        LOGGER.trace("Unlink from thread: " + sessionIdentifier);
         String threadSessionKey = getThreadSessionKey(sessionKey);
         THREAD_SESSION_KEY_WEBDRIVER_MAP.remove(threadSessionKey, eventFiringWebDriver);
 
@@ -197,6 +199,7 @@ public static void shutdownWebDriver(WebDriver webDriver) {
 
         beforeQuitActions.forEach(webDriverConsumer -> {
             try {
+                LOGGER.trace("Call before shutdown handler");
                 webDriverConsumer.accept(webDriver);
             } catch (Exception e) {
                 LOGGER.error("Failed executing before shutdown handler", e);
@@ -207,13 +210,15 @@ public static void shutdownWebDriver(WebDriver webDriver) {
 
         afterQuitActions.forEach(webDriverConsumer -> {
             try {
+                LOGGER.trace("Call after shutdown handler");
                 webDriverConsumer.accept(webDriver);
             } catch (Exception e) {
                 LOGGER.error("Failed executing after shutdown handler", e);
             }
         });
         unlinkFromThread(sessionKey, webDriver);
         WEBDRIVER_SESSIONS_CONTEXTS_MAP.remove(WebDriverUtils.getLowestWebDriver(webDriver));
+        LOGGER.debug("Shut down: " + sessionIdentifier);
     }