Merge pull request #155 from OpticFusion1/update

Changes
OpticFusion1 · Jun 13, 2019 · 666912a · 666912a
2 parents 088aced + c861156
commit 666912a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/optic_fusion1/mcantimalware/Main.java b/src/main/java/optic_fusion1/mcantimalware/Main.java
@@ -127,6 +127,10 @@ private void init() {
                 printOnlyIfInfected = (Boolean) options.valueOf("printOnlyIfInfected");
             }
         }
+        if(!scanDirectory.exists()){
+            logger.alert("The scan directory '" + scanDirectory.getName() + "' doesn't exist");
+            System.exit(0);
+        }
         downloadChecksumDatabase(false);
         checkManager = new CheckManager(this);
         new CheckRegistery(this).registerChecks();

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" packages="optic_fusion1.mcantimalware.logging">
+<Configuration status="WARN">
     <Appenders>
-        <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
-        <Queue name="TerminalConsole">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
-        </Queue>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n"/>
+        </Console>
         <RollingRandomAccessFile name="File" fileName="AntiMalware/latest.log" filePattern="AntiMalware/%d{yyyy-MM-dd}-%i.log.gz">
             <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
             <Policies>
@@ -16,12 +15,8 @@
     </Appenders>
     <Loggers>
         <Root level="info">
-            <filters>
-                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-            </filters>
-            <AppenderRef ref="WINDOWS_COMPAT" level="info"/>
             <AppenderRef ref="File"/>
-            <AppenderRef ref="TerminalConsole" level="info"/>
+            <AppenderRef ref="Console"/>
         </Root>
     </Loggers>
     <CustomLevels>
@@ -33,5 +28,4 @@
         <CustomLevel name="EXCEPTION" intLevel="1200" />
         <CustomLevel name="MALICIOUS" intLevel="1300" />
     </CustomLevels>
-</Configuration>
-
+</Configuration>