reversed last changes to Logger

Author: NoteFox

src/java/Playground.java

@@ -0,0 +1,57 @@
+import Server.CustomObjects.LogType;
+import Server.FTPService.FTPCli.FtpClient;
+import Server.LogService.Logger;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class Playground {
+    static String currentWritingDir;
+    static String logDefaultDir;
+    static SimpleDateFormat dirFormatter = new SimpleDateFormat("yyyy-MM-dd");
+    static String currentWritingFile;
+    static String baseFile;
+    static SimpleDateFormat fileFormatter = new SimpleDateFormat("HH-mm-ss z");
+
+
+    public static void main(String[] args) {
+        logDefaultDir = "";
+        baseFile = "LOG";
+
+        currentWritingDir = logDefaultDir + dirFormatter.format(System.currentTimeMillis() - 86400000 );
+        currentWritingFile = currentWritingDir + "/" + baseFile.replace(".txt", "") + "["+ fileFormatter.format(System.currentTimeMillis() - 86400000) +"].txt";
+
+        swapToNextDayDirIfNecessary();
+    }
+
+    private static void swapToNextDayDirIfNecessary() {
+        Date date = new Date(System.currentTimeMillis());
+
+        if (!currentWritingDir.equals(logDefaultDir + dirFormatter.format(date))) {
+            File nwd = new File(logDefaultDir + dirFormatter.format(date));
+
+            if (!nwd.exists())
+                nwd.mkdir();
+
+            currentWritingDir = "./" + nwd.getName();
+
+            currentWritingFile = currentWritingDir + "/" + baseFile.replace(".txt", "") + "["+ fileFormatter.format(System.currentTimeMillis()) +"].txt";;
+
+            File file = new File(currentWritingFile);
+            if (!file.exists()) {
+                try {
+                    file.createNewFile();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+}

src/java/Server/CustomObjects/QueryRequest.java

@@ -5,9 +5,6 @@
 import java.io.*;
 import java.util.List;
 
-import static Server.StaticVariables.mapDir;
-import static Server.StaticVariables.osmDir;
-
 public class QueryRequest extends Thread {
 
     private List<Coords> coordinates;
@@ -21,7 +18,13 @@ public class QueryRequest extends Thread {
 
     private String TAG;
 
-    public QueryRequest(List<Coords> coordinates, String date, String mapName, int id) {
+    private String osmDir;
+    private String mapDir;
+
+    public QueryRequest(List<Coords> coordinates, String date, String mapName, int id, String osmDir, String mapDir) {
+        this.osmDir = osmDir;
+        this.mapDir = mapDir;
+
         this.coordinates = coordinates;
         this.date = date;
         this.mapName = mapName;

src/java/Server/FTPService/FTPService.java

@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static Server.StaticVariables.*;
-
 public class FTPService implements Runnable {
 
     private FtpServer server;
@@ -33,8 +31,24 @@ public class FTPService implements Runnable {
     private UserManager um;
     private PropertiesUserManagerFactory userManagerFactory;
 
+    private int ftpPort;
+    private String ftpServiceUserPropertiesFile;
+    private String standardUserName;
+    private String standardUserPassword;
+    private String ftpServiceMapDir;
+    private String ftpDefaultDir;
+
     private String TAG = "FTPService-Thread";
 
+    public FTPService(int ftpPort, String ftpServiceUserPropertiesFile, String standardUserName, String standardUserPassword, String ftpServiceMapDir, String ftpDefaultDir) {
+        this.ftpPort = ftpPort;
+        this.ftpServiceUserPropertiesFile = ftpServiceUserPropertiesFile;
+        this.standardUserName = standardUserName;
+        this.standardUserPassword = standardUserPassword;
+        this.ftpServiceMapDir = ftpServiceMapDir;
+        this.ftpDefaultDir = ftpDefaultDir;
+    }
+
     @Override
     public void run() {
 

src/java/Server/LogService/Logger.java

@@ -8,8 +8,6 @@
 import java.util.Date;
 import java.util.List;
 
-import static Server.StaticVariables.*;
-
 public class Logger extends Thread implements LoggerInt {
 
     public static Logger instance;
@@ -27,7 +25,15 @@ public class Logger extends Thread implements LoggerInt {
     private Boolean isWaiting = false;
     public boolean isRunning = false;
 
-    public Logger() {
+    private String logDefaultDir;
+    private int maxLogFileSize;
+    private boolean logTerminalOutput;
+
+    public Logger(String logDefaultDir, int maxLogFileSize, boolean logTerminalOutput) {
+
+        this.logDefaultDir = logDefaultDir;
+        this.maxLogFileSize = maxLogFileSize;
+        this.logTerminalOutput = logTerminalOutput;
 
         this.baseFile = "LOG";
 
@@ -60,7 +66,7 @@ private void swapToNextFileIfNecessary() {
         }
     }
 
-    private void swapToNextDayDirIfNecessary() {
+    private void swapToNextDayDirIfNecessary() throws IOException {
         Date date = new Date(System.currentTimeMillis());
 
         if (!currentWritingDir.equals(logDefaultDir + dirFormatter.format(date))) {
@@ -73,11 +79,10 @@ private void swapToNextDayDirIfNecessary() {
 
             currentWritingFile = currentWritingDir + "/" + baseFile.replace(".txt", "") + "["+ fileFormatter.format(System.currentTimeMillis()) +"].txt";;
 
-            try {
-                new File(currentWritingFile).createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            File file = new File(currentWritingFile);
+
+            if (!file.exists())
+                file.createNewFile();
         }
     }
 
@@ -93,7 +98,11 @@ public synchronized void run() {
         }
 
         while (true) {
-            swapToNextDayDirIfNecessary();
+            try {
+                swapToNextDayDirIfNecessary();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             swapToNextFileIfNecessary();
             if (BUFFER_LIST.isEmpty()) {
                 isWaiting = true;
@@ -114,6 +123,9 @@ private void writeEntry(LogEntry entry) throws IOException {
         String temp = "";
         File file = new File(currentWritingFile);
 
+        if (!file.exists())
+            file.createNewFile();
+
         Date date = new Date(System.currentTimeMillis());
         String input = entry.type + " | " + logFormatter.format(date) + " | " + entry.TAG + " : " + entry.message;
 

src/java/Server/SpringClass.java

@@ -17,12 +17,13 @@
 
 import static Server.CustomObjects.LogType.ERROR;
 import static Server.CustomObjects.LogType.INFO;
-import static Server.StaticVariables.*;
 
 @SpringBootApplication
 @RestController
 public class SpringClass {
 
+    private static String initFile = "init.txt";
+
     private static ServiceNew serviceInstance;
     private static Thread serviceThread;
 
@@ -32,16 +33,17 @@ public class SpringClass {
     private String TAG = "Spring-Thread";
 
     public static void main(String[] args) throws IOException {
-
         // just standard inits for the Variables used in this Project
         // most of them are read from the init.txt
         // but more of that in the OHDM wiki
+
+        new StaticVariables("init.txt");
         StaticVariables.init();
         StaticVariables.createStdFilesAndDirs();
 
         // Logger is a singleton Class due to the availability need
         // the Logger is a System in itself
-        new Logger();
+        new Logger(StaticVariables.logDefaultDir, StaticVariables.maxLogFileSize, StaticVariables.logTerminalOutput);
         Logger.instance.start();
 
         // the service instance, which just goes through a couple of lists and sets things to what they are
@@ -52,12 +54,12 @@ public static void main(String[] args) throws IOException {
         serviceThread.start();
 
         // the ftp service, which allows the Android App to download the .map files
-        ftpInstance = new FTPService();
+        ftpInstance = new FTPService(StaticVariables.ftpPort, StaticVariables.ftpServiceUserPropertiesFile,  StaticVariables.standardUserName, StaticVariables.standardUserPassword, StaticVariables.ftpServiceMapDir, StaticVariables.ftpDefaultDir);
         ftpThread = new Thread(ftpInstance);
         ftpThread.start();
 
         // and here starts the Spring Application with the server port set to the
-        // before given Port in StaticVariables
+        // before given Port in Server.StaticVariables
         System.getProperties().put("server.port", StaticVariables.webPort);
         SpringApplication.run(SpringClass.class, args);
     }
@@ -120,7 +122,7 @@ public String webServiceStatus() {
             sb.append(" | ----------------------------------------------------------------------" +"<br>");
             sb.append(" | - Date : " + r.getDate() + "<br>");
             sb.append(" | - Coords : \n" + r.getPrintableCoordsString() + "<br>");
-            sb.append(" | - Link to download .map file : <a href=\"ftp:"+ standardUserName + ":" +standardUserPassword + "@141.45.146.200:5000/" + r.getMapName()+ ".map\">direct link</a> <br>");
+            sb.append(" | - Link to download .map file : <a href=\"ftp:"+ StaticVariables.standardUserName + ":" + StaticVariables.standardUserPassword + "@141.45.146.200:5000/" + r.getMapName()+ ".map\">direct link</a> <br>");
             sb.append(" | ---------------------------------------------------------------------</p>");
             i++;
         }
@@ -151,7 +153,7 @@ public String request(@RequestParam(value = "name", defaultValue = "testRequest"
             }
 
             // TODO : add id system
-            q = new QueryRequest(coordinates, date, mapname, 0000);
+            q = new QueryRequest(coordinates, date, mapname,0000, StaticVariables.osmDir, StaticVariables.mapDir);
 
             Logger.instance.addLogEntry(INFO, TAG,"given Data: " + mapname + " | Date: " + date + " | coords: \n" + q.getPrintableCoordsString());
 
@@ -254,8 +256,8 @@ public String sanitize_mapName(String nme) {
      * @return true if existent, false if not
      */
     public boolean map_exist(String nme) {
-        File fOSM = new File(osmDir + nme);
-        File fMAP = new File(mapDir + nme);
+        File fOSM = new File(StaticVariables.osmDir + nme);
+        File fMAP = new File(StaticVariables.mapDir + nme);
 
         if (!(fOSM.exists() && !fOSM.isDirectory()))
             if (!(fMAP.exists() && !fOSM.isDirectory()))