Configure log level from console (#885)

Signed-off-by: Hernan Ponce de Leon <[email protected]>
Co-authored-by: Hernan Ponce de Leon <[email protected]>

Author: hernanponcedeleon

dartagnan/src/main/resources/info.xml

@@ -13,20 +13,10 @@
         <File name="File" fileName="${logDir}/logs/${logFile}.log">
             <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
         </File>
-        <Console name="Refinement_Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
-        </Console>
-        <File name="Refinement_File" fileName="${logDir}/logs/refinement.log">
-            <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
-        </File>
     </Appenders>
 
     <Loggers>
-        <Logger name="com.dat3m.dartagnan.verification.solving.RefinementSolver" level="off" additivity="false">
-            <AppenderRef ref="Refinement_Console"/>
-            <AppenderRef ref="Refinement_File"/>
-        </Logger>
-        <Root level="off">
+        <Root level="${sys:logLevel:-WARN}">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>
         </Root>

dartagnan/src/main/resources/off.xml renamed to dartagnan/src/main/resources/log4j2.xml

@@ -13,19 +13,9 @@
         <File name="File" fileName="${logDir}/surefire-logs/${logFile}.log">
             <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
         </File>
-        <Console name="Refinement_Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
-        </Console>
-        <File name="Refinement_File" fileName="${logDir}/surefire-logs/refinement.log">
-            <PatternLayout pattern="%d{[dd.MM.yyyy] HH:mm:ss} %highlight{[%level]} %C{1}.%M - %msg%n"/>
-        </File>
     </Appenders>
 
     <Loggers>
-        <Logger name="com.dat3m.dartagnan.verification.solving.RefinementSolver" level="off" additivity="false">
-            <AppenderRef ref="Refinement_Console"/>
-            <AppenderRef ref="Refinement_File"/>
-        </Logger>
         <Root level="off">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="File"/>

dartagnan/src/main/resources/warn.xml

@@ -18,7 +18,7 @@ java_cmd="${DAT3M_JAVA}"
 jar=${DAT3M_HOME}/dartagnan/target/dartagnan.jar
 args=""
 this="$0"
-log=${DAT3M_HOME}/dartagnan/src/main/resources/warn.xml
+log=warn
 
 if [ -z "${java_cmd}" ]; then
     java_cmd="java"
@@ -59,7 +59,7 @@ while [ "$#" != "0" ]; do
             solver="$1"
         ;;
         -v)
-            log="${DAT3M_HOME}"/dartagnan/src/main/resources/info.xml
+            log=info
         ;;
         -help)
             usage
@@ -144,7 +144,7 @@ if [ -z "${solver}" ]; then
 fi
 
 # now we construct the full command
-cmd="${java_cmd} -jar -Dlog4j2.configurationFile=file:${log} ${jar}"
+cmd="${java_cmd} -DlogLevel=${log} -jar ${jar}"
 cmd="${cmd} ${cat}"
 cmd="${cmd} --target=${target}"
 cmd="${cmd} --property=${property}"
@@ -153,7 +153,7 @@ cmd="${cmd} --solver=${solver}"
 cmd="${cmd} ${args}"
 
 # before calling the command, print it on the screen for reference
-if [ "$log" = "${DAT3M_HOME}"/dartagnan/src/main/resources/info.xml ]; then
+if [ "$log" = info ]; then
     echo "# ${cmd}"
 fi
 exec ${cmd}