diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/App.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/App.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java index 1805d5a..cdbab6c 100644 --- a/src/main/java/org/openslx/satellitedaemon/App.java +++ b/src/main/java/org/openslx/satellitedaemon/App.java @@ -1,7 +1,5 @@ package org.openslx.satellitedaemon; -import java.io.IOException; - import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Logger; import org.openslx.satellitedaemon.filetransfer.FileDownloadWorker; @@ -19,16 +17,7 @@ public class App public static void main( String[] args ) { BasicConfigurator.configure(); - try { - Globals.loadProperties(); - if ( !Globals.propertiesValid() ) { - log.error( "Config file contains errors." ); - System.exit( 1 ); - } - } catch ( IOException e ) { - log.error( "Could not load config file. Quitting." ); - System.exit( 1 ); - } + Globals.init(); if (!Globals.masterServerSslContextInit()){ log.error( "Problem with initializing the SSLContext" ); System.exit( 1 ); |