Use logback for acid logging too

diff --git a/acid/src/main/java/net/rizon/acid/core/Acidictive.java b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
index 9275bf9220c98987f569c3feb515a28298b1f8f2..b44a257e95669441de1998ef9d6dc0b60e1aa6c9 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Acidictive.java
+++ b/acid/src/main/java/net/rizon/acid/core/Acidictive.java
@@ -26,6 +26,8 @@ import org.slf4j.LoggerFactory;
 public class Acidictive extends AcidCore
 {
        private static final Logger log = LoggerFactory.getLogger(Acidictive.class);
+       // logs here don't go to irc
+       public static final Logger fileLogger = LoggerFactory.getLogger("file");
 
        public static CloakGenerator cloakGenerator;
        public static Config conf;
@@ -670,62 +672,6 @@ public class Acidictive extends AcidCore
                Protocol.notice(me.getSID(), recipient, message);
        }
 
-       static SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-
-       public static void log(String str)
-       {
-               Calendar now = Calendar.getInstance();
-               File f = new File("logs//acidictive.log." + formatter.format(now.getTime()));
-               now.clear();
-               now = null;
-               String date = "[" + new Date().toString() + "]: ";
-               BufferedWriter print = createWriter(f, true);
-               try
-               {
-                       print.write(date + str);
-                       print.newLine();
-                       print.close();
-                       print = null;
-               }
-               catch (Exception e)
-               {
-                       log.warn("Unable to write to logfile", e);
-               }
-               f = null;
-       }
-
-       public static BufferedWriter createWriter(File f, boolean append)
-       {
-               // delete the file if we are told not to append
-               if (!append)
-                       f.delete();
-               // check if the folder exists, create if it doesn't
-               if (f.getParentFile() != null && !f.getParentFile().exists())
-                       f.getParentFile().mkdir();
-               // check if the file exists, create if it doesn't
-               if (!f.exists())
-               {
-                       try
-                       {
-                               f.createNewFile();
-                       }
-                       catch (Exception e)
-                       {
-                               log.warn("Unable to create file", e);
-                       }
-               }
-               // all successful, let's create and return the BufferedWriter
-               try
-               {
-                       return new BufferedWriter(new FileWriter(f.getPath(), append));
-               }
-               catch (Exception e)
-               {
-                       log.warn(null, e);
-               }
-               return null;
-       }
-
        public static void reply(String source, String target, String msg)
        {
                if (!target.startsWith("#"))

diff --git a/acid/src/main/java/net/rizon/acid/logging/FileFilter.java b/acid/src/main/java/net/rizon/acid/logging/FileFilter.java
new file mode 100644 (file)
index 0000000..347c84d
--- /dev/null
+++ b/acid/src/main/java/net/rizon/acid/logging/FileFilter.java
@@ -0,0 +1,17 @@
+package net.rizon.acid.logging;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+import net.rizon.acid.core.Acidictive;
+
+public class FileFilter extends Filter<ILoggingEvent>
+{
+       @Override
+       public FilterReply decide(ILoggingEvent event)
+       {
+               boolean isFileLogger = event.getLoggerName().equals(Acidictive.fileLogger.getName());
+               return isFileLogger ? FilterReply.DENY : FilterReply.NEUTRAL;
+       }
+
+}

diff --git a/acid/src/main/resources/logback.xml b/acid/src/main/resources/logback.xml
index 5d423bcc19bead5fb36e18d0efc0dfd0545f7dad..5563b590eb52f208c84c44fcbedbb5172cc2ff5c 100644 (file)
--- a/acid/src/main/resources/logback.xml
+++ b/acid/src/main/resources/logback.xml
@@ -4,7 +4,7 @@
        <timestamp key="byDay" datePattern="yyyyMMdd"/>\r
 \r
        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">\r
-               <filter class="net.rizon.moo.logging.ConsoleFilter" />\r
+               <filter class="net.rizon.acid.logging.ConsoleFilter" />\r
 \r
                <encoder>\r
                        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{5} - %msg%n</pattern>\r
@@ -21,7 +21,9 @@
                </encoder>\r
        </appender>\r
        \r
-       <appender name="IRC" class="net.rizon.acid.logging.Logger" />\r
+       <appender name="IRC" class="net.rizon.acid.logging.Logger">\r
+               <filter class="net.rizon.acid.logging.FileFilter" />\r
+       </appender>\r
 \r
        <root level="DEBUG">          \r
                <appender-ref ref="STDOUT" />\r