summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--src/main/java/org/openslx/imagemaster/App.java2
-rw-r--r--src/main/java/org/openslx/imagemaster/Globals.java3
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index cf08934..1b75bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
/src/main/java/org/openslx/imagemaster/thrift/iface
/gen-java
/src/main/properties/ftp.properties
-/config/ftp.jks
+/config/sslsocket.jks
/config/ldap.jks
/config/servers.jks
/management-interface/tmp
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 4a4baf0..68c188f 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -26,6 +26,8 @@ public class App
// Init logging
log.info( "Starting Application" );
+ Globals.init();
+
// Create binary listener
Thread t;
t = new Thread( new BinaryListener(), "BinaryListener" );
diff --git a/src/main/java/org/openslx/imagemaster/Globals.java b/src/main/java/org/openslx/imagemaster/Globals.java
index 6e5893e..3675d96 100644
--- a/src/main/java/org/openslx/imagemaster/Globals.java
+++ b/src/main/java/org/openslx/imagemaster/Globals.java
@@ -15,6 +15,8 @@ public class Globals
private static Logger log = Logger.getLogger( Globals.class );
private static final Properties properties = new Properties();
public final static int blockSize = 16 * 1024 * 1024;
+
+ public static void init() {}
/**
* Loads the properties from config/global.properties
@@ -75,6 +77,7 @@ public class Globals
log.warn( e.getStackTrace().toString() );
System.exit( 2 );
}
+ log.info( "Loaded properties successfully" );
}
/* INTEGERS */