From 001d65704534d5beabd8bf357da7de746558d06b Mon Sep 17 00:00:00 2001 From: Björn Hagemeister Date: Mon, 24 Nov 2014 13:41:19 +0100 Subject: Moved proxy configuration to the top for being able using the command line argument option also via proxy. --- src/main/java/org/openslx/satellitedaemon/App.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java index e65f01b..155c5ab 100644 --- a/src/main/java/org/openslx/satellitedaemon/App.java +++ b/src/main/java/org/openslx/satellitedaemon/App.java @@ -23,10 +23,14 @@ public class App { BasicConfigurator.configure(); - log.info( "Ping: " + ThriftConnection.ping() ); + // log.info( "Ping: " + ThriftConnection.ping() ); - System.exit( 0 ); + // System.exit( 0 ); + log.info( "Configure proxy settings ..." ); + ProxyConfiguration.configProxy(); + log.info( "... proxy settings are done." ); + int i = 0; String arg; String organizationName; @@ -117,10 +121,6 @@ public class App System.exit( 1 ); } - log.info( "Configure proxy settings ..." ); - ProxyConfiguration.configProxy(); - log.info( "... proxy settings are done." ); - // Start Up- and Download. Thread uploadWorker = new Thread( new FileUploadWorker() ); uploadWorker.start(); -- cgit v1.2.3-55-g7522