summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
diff options
context:
space:
mode:
authorSimon Rettberg2024-06-06 11:42:16 +0200
committerSimon Rettberg2024-06-06 11:42:16 +0200
commitc767c6489999c5497107860e1e90862af8671bb1 (patch)
tree723dcc051fbc9c37dbede62f1d9d3bc64d4a9d2b /src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
parentSwitch to new CascadedThreadPool (diff)
downloadmasterserver-c767c6489999c5497107860e1e90862af8671bb1.tar.gz
masterserver-c767c6489999c5497107860e1e90862af8671bb1.tar.xz
masterserver-c767c6489999c5497107860e1e90862af8671bb1.zip
Implemente read-only mode for secondary server(s)
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
index f3831b0..22c4183 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
@@ -74,11 +74,15 @@ public class ConnectionHandler implements IncomingEvent
SSLContext sslContext = SSLContext.getInstance( "TLSv1.2" );
KeyManager[] keyManagers = kmf.getKeyManagers();
sslContext.init( keyManagers, null, null );
- ssl = new Listener( eventHandler, sslContext, Globals.getFiletransferPortSsl(), Globals.getFiletransferTimeout() * 1000 );
- ssl.start();
- plain = new Listener( eventHandler, null, Globals.getFiletransferPortPlain(), Globals.getFiletransferTimeout() * 1000 );
- plain.start();
- // TODO: Bail out/retry if failed, getters for ports
+ if ( Globals.getFiletransferPortSsl() > 0 ) {
+ ssl = new Listener( eventHandler, sslContext, Globals.getFiletransferPortSsl(), Globals.getFiletransferTimeout() * 1000 );
+ ssl.start();
+ }
+ if ( Globals.getFiletransferPortPlain() > 0 ) {
+ plain = new Listener( eventHandler, null, Globals.getFiletransferPortPlain(), Globals.getFiletransferTimeout() * 1000 );
+ plain.start();
+ }
+ // TODO: Bail out/retry if failed
} catch ( Exception e ) {
LOGGER.error( "Initialization failed.", e );
System.exit( 2 );
@@ -110,14 +114,14 @@ public class ConnectionHandler implements IncomingEvent
public static int getSslPort()
{
- if ( sslListener.isRunning() )
+ if ( sslListener != null && sslListener.isRunning() )
return sslListener.getPort();
return 0;
}
public static int getPlainPort()
{
- if ( plainListener.isRunning() )
+ if ( plainListener != null && plainListener.isRunning() )
return plainListener.getPort();
return 0;
}
@@ -147,8 +151,6 @@ public class ConnectionHandler implements IncomingEvent
} else {
absDestination = new File( Globals.getImageDir(), existing.exImagePath );
}
- plainListener.start();
- sslListener.start();
try {
transfer = new IncomingTransfer( img, blockHashes, absDestination, getPlainPort(), getSslPort() );
} catch ( FileNotFoundException e ) {