diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/server/StartServer.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/server/StartServer.java | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/dozentenmodulserver/src/main/java/server/StartServer.java b/dozentenmodulserver/src/main/java/server/StartServer.java index 04314ee7..a5631622 100644 --- a/dozentenmodulserver/src/main/java/server/StartServer.java +++ b/dozentenmodulserver/src/main/java/server/StartServer.java @@ -1,59 +1,50 @@ package server; -import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.List; + import models.Configuration; + import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; -import org.ini4j.InvalidFileFormatException; -import org.ini4j.Wini; -import server.BinaryListener; +import fileserv.FileServer; public class StartServer { - /** - * @param args - */ - private static Logger log = Logger.getLogger(StartServer.class); private static List<Thread> servers = new ArrayList<>(); public static void main(String[] args) { - //get going and show basic information in logfile BasicConfigurator.configure(); - log.info("*************************************************************************************************"); - log.info("******************* " + new Date() + " - starting Application ***********************"); - log.info("*************************************************************************************************"); + log.info("****************************************************************"); + log.info("******************* starting Application ***********************"); + log.info("****************************************************************"); // get Configuration try { - log.info(new Date() + " - Getting config from .ini-file"); - Wini ini = new Wini(new File("Server_Config.ini")); - Configuration.config.setAbsolute_path(ini.get("ftp", - "path_absolute")); - Configuration.config - .setSql_connection(ini.get("sql", "connection")); - Configuration.config.setSql_pass(ini.get("sql", "pass")); - Configuration.config.setSql_user(ini.get("sql", "user")); - } catch (InvalidFileFormatException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + log.info("Loading configuration"); + Configuration.load(); + } catch (Exception e1) { + log.fatal("Could not load configuration", e1); + System.exit(1); + } + + // Start file transfer server + if (!FileServer.instance().start()) { + log.error("Could not start internal file server."); + return; } // Start Server Thread t; t = new Thread(new BinaryListener()); servers.add(t); t.start(); + // Wait for servers for (Thread wait : servers) { boolean success = false; while (!success) { |