Imported Upstream version 1.2.0

[platform/upstream/iotivity.git] / cloud / stack / src / main / java / org / iotivity / cloud / util / Log.java

diff --git a/cloud/stack/src/main/java/org/iotivity/cloud/util/Logger.java b/cloud/stack/src/main/java/org/iotivity/cloud/util/Log.java
similarity index 61%
rename from cloud/stack/src/main/java/org/iotivity/cloud/util/Logger.java
rename to cloud/stack/src/main/java/org/iotivity/cloud/util/Log.java
index fce3f51..3dc258b 100644 (file)
--- a/cloud/stack/src/main/java/org/iotivity/cloud/util/Logger.java
+++ b/cloud/stack/src/main/java/org/iotivity/cloud/util/Log.java
@@ -21,18 +21,66 @@
  */
 package org.iotivity.cloud.util;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-public class Logger {
+import org.apache.log4j.Logger;
 
-    public static final int VERBOSE = 0;
-    public static final int DEBUG   = 1;
-    public static final int INFO    = 2;
-    public static final int WARNING = 3;
-    public static final int ERROR   = 4;
+import io.netty.channel.Channel;
+
+public class Log {
+
+    public static final int VERBOSE  = 0;
+    public static final int DEBUG    = 1;
+    public static final int INFO     = 2;
+    public static final int WARNING  = 3;
+    public static final int ERROR    = 4;
+
+    private static int      logLevel = VERBOSE;
+
+    private static FileOutputStream fos = null;
+    private static PrintStream      ps  = null;
+
+    private final static Logger logger = Logger.getLogger(Log.class);
+
+    public static void Init() throws FileNotFoundException {
+        System.setOut(Log.createLoggingProxy(System.out));
+        createfile();
+    }
+
+    public static PrintStream createLoggingProxy(
+            final PrintStream realPrintStream) {
+        // TODO Auto-generated method stub
+        return new PrintStream(realPrintStream) {
+            public void print(final String string) {
+                realPrintStream.print(string);
+                logger.fatal(string);
+            }
+        };
+    }
+
+    public static void createfile() throws FileNotFoundException{
+        File dir = new File("..//errLog//");
+        if (!dir.isDirectory()) {
+            dir.mkdirs();
+        }
+        fos = new FileOutputStream("../errLog/[" + getDate() + "] error.log",
+                true);
+        ps = new PrintStream(fos);
+    }
+
+    static public void f(Channel channel, Throwable t) {
+        String log = channel.id().asLongText().substring(26) + " "
+                + t.getMessage();
+        ps.println(getTime() + " " + log);
+        t.printStackTrace(ps);
+        Log.v(log);
+    }
 
-    private static int logLevel = DEBUG;
 
     public static void setLogLevel(int level) {
         logLevel = level;
@@ -110,13 +158,20 @@ public class Logger {
         return res;
     }
 
-    private static String getTime() {
+    protected static String getTime() {
         Calendar calendar = Calendar.getInstance();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSS");
+        SimpleDateFormat dateFormat = new SimpleDateFormat(
+                "yyyy-MM-dd HH:mm:ss:SSS");
 
         return dateFormat.format(calendar.getTime());
     }
 
+    protected static String getDate() {
+        Calendar calendar = Calendar.getInstance();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        return dateFormat.format(calendar.getTime());
+    }
+
     private static String getLogLevelString(int level) {
 
         String res = "";