From 859c07eba2b19a11340e473340e408c0a24380de Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Mon, 18 Aug 2014 15:34:18 +0200
Subject: Change implementation of the configuration in Global.java

Add sample config file
---
 src/main/java/org/openslx/satellitedaemon/App.java | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/main/java/org/openslx/satellitedaemon/App.java')

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 );
-- 
cgit v1.2.3-55-g7522