From 93275e45ae069584bbba9d9791d477910385f7b9 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 13 Sep 2014 13:55:37 +0200
Subject: [client] MAsterserver thrift connection: Set connection timeout of 6
 secs

---
 .../main/java/thrift/MasterThriftConnection.java   | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'dozentenmodul/src/main/java/thrift/MasterThriftConnection.java')

diff --git a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
index 0ff6f7bd..eec1d785 100644
--- a/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/MasterThriftConnection.java
@@ -8,18 +8,17 @@ import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 
+public class MasterThriftConnection {
 
+	public static final String MASTERSERVER_IP = "132.230.4.16";
+	public static final int MASTERSERVER_PORT = 9090;
+	public static final int MASTERSERVER_TIMEOUT_MS = 6000;
+
+	final TTransport transport = new TFramedTransport(new TSocket(
+			MASTERSERVER_IP, MASTERSERVER_PORT, MASTERSERVER_TIMEOUT_MS));
+
+	public Client getMasterThriftConnection() {
 
-public class MasterThriftConnection {
-	
-	public static final String MASTERSERVERIP="132.230.4.16"; 
-	//public static final String MASTERSERVERIP="127.0.0.1"; 
-	
-	final TTransport transport = new TFramedTransport ( new TSocket(MASTERSERVERIP, 9090) );
-	
-	public Client getMasterThriftConnection()
-	{
-		
 		try {
 			transport.open();
 		} catch (TTransportException e) {
@@ -30,12 +29,11 @@ public class MasterThriftConnection {
 		final TProtocol protocol = new TBinaryProtocol(transport);
 		final Client client = new Client(protocol);
 		System.out.println("Masterserver erreichbar.");
-		
+
 		return client;
 	}
 
-	public void closeMasterThriftConnection()
-	{
+	public void closeMasterThriftConnection() {
 		transport.close();
 	}
 }
-- 
cgit v1.2.3-55-g7522