diff options
| author | Nils Schwabe | 2014-07-04 11:01:15 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-07-04 11:01:15 +0200 |
| commit | 4414f9a65b1b41088fa360ac51df53d79930e20a (patch) | |
| tree | 99095acd9d15dacb8cf7f24f60ddc4e235813063 /src | |
| parent | Change loading and checking of properties (diff) | |
| download | masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.gz masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.tar.xz masterserver-4414f9a65b1b41088fa360ac51df53d79930e20a.zip | |
Fix that Globals are initialized before servers are starting up
Add serversocket.jks to .gitignore
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/App.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/Globals.java | 3 |
2 files changed, 5 insertions, 0 deletions
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 */ |