From 47732cf8f3786b483be9859fc77c5e9191957d29 Mon Sep 17 00:00:00 2001
From: Simon Bussmann <simon@bussmann.es>
Date: Mon, 22 Mar 2021 04:20:10 +0100
Subject: [PATCH] Server logging improved

---
 Server/src/logging/LogType.java      |  3 ++-
 Server/src/logging/ServerLogger.java | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Server/src/logging/LogType.java b/Server/src/logging/LogType.java
index 1b79885..a548c18 100644
--- a/Server/src/logging/LogType.java
+++ b/Server/src/logging/LogType.java
@@ -2,6 +2,7 @@ package logging;
 
 public enum LogType {
     Log,
-    Message,
+    Input,
+    Output,
     Error
 }
diff --git a/Server/src/logging/ServerLogger.java b/Server/src/logging/ServerLogger.java
index 198ed49..78ad266 100644
--- a/Server/src/logging/ServerLogger.java
+++ b/Server/src/logging/ServerLogger.java
@@ -1,6 +1,7 @@
 package logging;
 
-import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class ServerLogger {
 
@@ -15,21 +16,29 @@ public class ServerLogger {
     private static final String ANSI_WHITE = "\u001B[37m";
 
     public void printLog(String message, String value, String name, LogType logType){
+        //generate timestamp with fixed length
+        String timestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS").format(new Date());
+
         switch (logType){
+            case Input:
+                System.out.printf(ANSI_WHITE + "(%s) [%s] [input ] %s: %s%n",timestamp, name, message, value);
+                break;
+
+            case Output:
+                System.out.printf(ANSI_CYAN + "(%s) [%s] [output] %s: %s%n",timestamp, name, message, value);
+                break;
+
             case Log:
-                System.out.printf(ANSI_CYAN + "%s %s: %s%n"+ANSI_RESET, new Timestamp(System.currentTimeMillis()), message, value);
+                System.out.printf(ANSI_PURPLE + "(%s)           [status] %s: %s%n"+ANSI_RESET, timestamp, message, value);
                 break;
 
             case Error:
-                System.out.printf(ANSI_RED + "%s %s: %s%n"+ ANSI_RESET, new Timestamp(System.currentTimeMillis()), message, value);
-                break;
-
-            case Message:
-                System.out.printf(ANSI_WHITE + "    %s %s %s%n" +ANSI_RESET, new Timestamp(System.currentTimeMillis()), name, message);
+                System.out.printf(ANSI_RED + "(%s) [error]          %s: %s%n"+ ANSI_RESET, timestamp, message, value);
                 break;
 
             default:
                 System.err.println("NO VALID LOGTYPE GIVEN");;
+                break;
         }
     }