diff options
| author | Björn Hagemeister | 2014-11-24 13:41:19 +0100 |
|---|---|---|
| committer | Björn Hagemeister | 2014-11-24 13:41:19 +0100 |
| commit | 001d65704534d5beabd8bf357da7de746558d06b (patch) | |
| tree | 871d11fe86a9910dfd21bf91b22a1477e3952d54 | |
| parent | Add TLS support for thrift connection to master, switch to TLSv1.2 everywhere (diff) | |
| download | satellite-daemon-001d65704534d5beabd8bf357da7de746558d06b.tar.gz satellite-daemon-001d65704534d5beabd8bf357da7de746558d06b.tar.xz satellite-daemon-001d65704534d5beabd8bf357da7de746558d06b.zip | |
Moved proxy configuration to the top for being able using the command line argument option also via proxy.HEADmaster
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/App.java | 12 |
1 files 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(); |