Create formatting utility, and improve logging output.

diff --git a/acid/src/main/java/net/rizon/acid/logging/Logger.java b/acid/src/main/java/net/rizon/acid/logging/Logger.java
index 7d5932da1a0c80209fe5d35798a2a0e0bb77be7f..392941c15fe44a8c80b19ce963a24a0c5e5c409d 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/logging/Logger.java
+++ b/acid/src/main/java/net/rizon/acid/logging/Logger.java
@@ -10,9 +10,27 @@ import java.util.List;
 import net.rizon.acid.core.AcidCore;
 import net.rizon.acid.core.Acidictive;
 import net.rizon.acid.core.User;
+import net.rizon.acid.util.Format;
 
 public class Logger extends UnsynchronizedAppenderBase<ILoggingEvent>
 {
+
+       private String calculateColor(Level level)
+       {
+               switch (level.toInt())
+               {
+                       case Level.DEBUG_INT:
+                               return Format.color(Format.GREY);
+                       case Level.INFO_INT:
+                               return "";
+                       case Level.WARN_INT:
+                               return Format.color(Format.ORANGE);
+                       case Level.ERROR_INT:
+                               return Format.color(Format.RED);
+                       default:
+                               return "";
+               }
+       }
        @Override
        protected void append(ILoggingEvent event)
        {
@@ -42,7 +60,7 @@ public class Logger extends UnsynchronizedAppenderBase<ILoggingEvent>
 
                        if (message != null)
                        {
-                               Acidictive.privmsg(routingSpam, message);
+                               Acidictive.privmsg(routingSpam, calculateColor(event.getLevel()) + Format.BOLD + event.getLevel() + Format.BOLD + Format.color(0) + " (" + event.getCallerData()[0].getFileName() + "): " + message);
                        }
 
                        if (throwable != null)

diff --git a/acid/src/main/java/net/rizon/acid/util/Format.java b/acid/src/main/java/net/rizon/acid/util/Format.java
new file mode 100644 (file)
index 0000000..e86f3b9
--- /dev/null
+++ b/acid/src/main/java/net/rizon/acid/util/Format.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016, Darius Jahandarie <djahandarie@rizon.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.rizon.acid.util;
+
+public class Format
+{
+       public static final char BOLD = 2;
+
+       public static final char COLOR = 3;
+       public static final int RED = 4;
+       public static final int ORANGE = 7;
+       public static final int YELLOW = 8;
+       public static final int BLUE = 10;
+       public static final int PINK = 13;
+       public static final int GREY = 14;
+
+       public static String color(int code)
+       {
+               if (code == 0)
+               {
+                       return COLOR + "";
+               }
+               return COLOR + "" + code;
+       }
+
+       public static String color(int code1, int code2)
+       {
+               return COLOR + "" + code1 + "," + code2;
+       }
+}

diff --git a/pom.xml b/pom.xml
index c34f37795bea2228cca139a344a6c267d23f8968..3223c21c66e0dc8c388d3ef6992614d600301ebb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,6 @@
        <modules>
                <module>acid</module>
 
-               <module>pyva</module>
                <module>trapbot</module>
        </modules>