New logging system

Removed the old logging system and started using the standard Java
logger instead.

src/main/java/common/MessagePacket.java

@@ -9,7 +9,7 @@ import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 
 public class MessagePacket implements Packet {
-	
+
 	/**
 	 * 
 	 */
@@ -18,39 +18,43 @@ public class MessagePacket implements Packet {
 	public enum MessageType {
 		PM, NORMAL, WARNING, ERROR, COMMAND, INFO
 	}
-	
+
 	public MessageType messType = MessageType.NORMAL;
 	public String content = "", channel = "", sender = "";
 	public SimpleAttributeSet style = new SimpleAttributeSet();
-	
+
 	public MessagePacket(String channel, String send, String con, MessageType messType) {
 		this.sender = send;
 		this.channel = channel;
 		this.content = con;
 		this.messType = messType;
 	}
-	
+
 	public MessagePacket(String con, MessageType messType) {
 		this.content = con;
 		this.messType = messType;
 	}
-	
+
 	public MessagePacket(String sender, String con) {
 		this("", sender, con, MessageType.NORMAL);
 	}
-	
+
 	public MessagePacket(String con) {
 		this("Info", "SERVER", con, MessageType.INFO);
 	}
-	
+
 	public boolean validate() {
 		return (!content.equals("")) && content != null;
 	}
-	
+
 	@Override
 	public String toString() {
+		return toString(true);
+	}
+
+	public String toString(boolean includeTimeStamp) {
 		boolean preInfo = false;
-		
+
 		switch (messType) {
 		case COMMAND:
 			StyleConstants.setForeground(style, Color.GREEN);
@@ -75,12 +79,14 @@ public class MessagePacket implements Packet {
 		default:
 			break;
 		}
-		
+
 		if (preInfo) {
-			DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
-			Date time = new Date();
-			String timestamp = dateFormat.format(time);
-			
+			String timestamp = "";
+			if (includeTimeStamp) {
+				DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
+				Date time = new Date();
+				timestamp = dateFormat.format(time);
+			}
 			String preInfoStr = timestamp + "<" + channel + ">" + sender + ": ";
 			return preInfoStr + content;
 		} else

src/main/java/server/ClientCollection.java

@@ -34,7 +34,7 @@ public class ClientCollection {
 		if (mess.validate()) {
 			for (Client c : clients)
 				c.send(mess);
-			Server.getOPClient().send(mess.toString());
+			Server.getOPClient().send(mess);
 		}
 	}
 

src/main/java/server/CommandRegistry.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.logging.Logger;
 import java.util.stream.Stream;
 
 import org.reflections.Reflections;
@@ -16,7 +17,7 @@ import server.command.CommandInfo;
 import util.ArrayUtil;
 
 public class CommandRegistry  {
-	
+	private static final Logger LOG = Logger.getLogger(CommandRegistry.class.getName());
 	private Map<String, Command> commands = new HashMap<>();
 	
 	private static final String COMMAND_PACKAGE = "server.command";
@@ -31,7 +32,7 @@ public class CommandRegistry  {
 				
 				if (!Arrays.asList(comm.getInterfaces()).contains(Command.class)) {
 					// TODO Proper logging
-					System.err.println(comm.getName() + " is annoteded with " + CommandInfo.class.getName() + ", but does not implement" + Command.class.getName());
+					LOG.warning(comm.getName() + " is annoteded with " + CommandInfo.class.getName() + ", but does not implement" + Command.class.getName());
 					continue;
 				}
 				

src/main/java/server/LocalClient.java

@@ -40,12 +40,11 @@ public class LocalClient extends Client {
 	@Override
 	public void send(Packet pack) {
 		if (pack instanceof MessagePacket)
-			send(pack.toString());
+			send(((MessagePacket) pack).toString(false));
 	}
 	
 	@Override
 	public void send(String message) {
-		System.out.println(message.toString());
-		Server.getLogger().log(message.toString());
+		Server.getLogger().info(message);
 	}
 }

src/main/java/server/Server.java

@@ -11,9 +11,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
 
 import common.MessagePacket;
-import util.Logger;
 
 public class Server {
 	private static Thread clientListener;
@@ -28,68 +30,56 @@ public class Server {
 
 	private static ServerSocket so;
 	private static LocalClient OPClient;
-	private static Logger log;
+	private static final Logger log = Logger.getGlobal();
 	private static CommandRegistry commandRegistry;
 
 	public static void main(String[] arg) {
-		System.out.println("Starting ChatServer version " + version + "...");
+		try {
+			LogManager.getLogManager().readConfiguration(Server.class.getResourceAsStream("/logger.properties"));
+		} catch (SecurityException | IOException e2) {
+			log.log(Level.SEVERE, e2.getMessage(), e2);
+		}
+		log.info("Starting ChatServer version " + version + "...");
 
-		System.out.print("Loadning properties file...");
+		log.fine("Loadning properties file...");
 		try {
 			prop.load(new FileReader(propFile));
 		} catch (FileNotFoundException e1) {
 			try {
 				prop.load(Server.class.getResourceAsStream("/" + propFile.getName()));
 			} catch (IOException e) {
-				e.printStackTrace();
+				log.log(Level.SEVERE, e.getMessage(), e);
 			}
 		} catch (IOException e1) {
-			e1.printStackTrace();
+			log.log(Level.SEVERE, e1.getMessage(), e1);
 		}
-		System.out.println("Done");
 
-		System.out.print("Reading numbers from properties object...");
+		log.fine("Reading numbers from properties object...");
 		port = Integer.parseInt(prop.getProperty("port"));
 		maxUsers = Integer.parseInt(prop.getProperty("maxUsers"));
-		System.out.println("Done");
 
-		System.out.print("Setting up socket...");
+		log.fine("Setting up socket...");
 		try {
 			so = new ServerSocket(port);
 		} catch (IOException ex) {
-			System.out.println("Error setting up socket. Server already running?");
-			System.exit(0);
+			log.log(Level.SEVERE, "Error setting up socket. Server already running?", ex);
+			return;
 		}
-		System.out.println("Done");
 
 		clients = new ClientCollection();
 		getChannels().add(new Channel("Main"));
 
-		System.out.print("Starting commandhandler...");
+		log.fine("Starting commandhandler...");
 		commandRegistry = new CommandRegistry();
-		System.out.println("Done");
 
-		System.out.print("Creating virtual local client...");
+		log.fine("Creating virtual local client...");
 		OPClient = new LocalClient();
-		System.out.println("Done");
-
-		System.out.print("Starting logger...");
-		try {
-			log = new Logger();
-		} catch (IOException e) {
-			System.out.println();
-			System.out.println("Unable to start logger.");
-			e.printStackTrace();
-			return;
-		}
-		System.out.println("Done");
 
-		System.out.print("Starting client listener thread...");
+		log.fine("Starting client listener thread...");
 		clientListener = new Thread(Server::listenClients);
 		clientListener.start();
-		System.out.println("Done");
 
-		System.out.println("Server started successfully!");
+		log.info("Server started successfully!");
 	}
 
 	static void listenClients() {
@@ -111,8 +101,7 @@ public class Server {
 				if (so.isClosed())
 					return;
 			} catch (Exception ex) {
-				System.out.println("Could not get new client!");
-				ex.printStackTrace();
+				log.log(Level.WARNING, "Could not get new client!", ex);
 			}
 		}
 	}
@@ -165,7 +154,6 @@ public class Server {
 		clients.disconnectAll();
 		getOPClient().disconnect();
 
-		log.close();
 		try {
 			prop.store(new PrintWriter(propFile), "ChatServer config file");
 		} catch (IOException e1) {

src/main/java/util/Logger.java

@@ -1,34 +0,0 @@
-package util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class Logger {
-	
-	PrintWriter out;
-	File log;
-	
-	public Logger() throws IOException {
-		DateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM(HH-mm)");
-		Date time = new Date();
-		String timestamp = dateFormat.format(time);
-		
-		log = new File("logs/log-" + timestamp + ".log");
-		log.getParentFile().mkdirs();
-		log.createNewFile();
-		out = new PrintWriter(log);
-	}
-	
-	public void log(String txt) {
-		out.println(txt);
-		out.flush();
-	}
-	
-	public void close() {
-		out.close();
-	}
-}