From e0ffef40cc9afcd734c78e7979dbd466b0b484cb Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 1 Oct 2014 16:04:26 +0200
Subject: [PATCH] Added possibility to set some more JBoss Remoting parameters
 with config.xml on server start.

---
 .../src/main/java/mage/client/MageFrame.java  |  2 +-
 Mage.Common/src/mage/remote/Connection.java   | 18 ++++++++++---
 Mage.Server/config/config.xml                 | 24 +++++++++++++++++
 Mage.Server/release/config/config.xml         |  9 ++++++-
 .../src/main/java/mage/server/Main.java       | 26 ++++++++++++++-----
 .../main/java/mage/server/util/Config.java    | 11 ++++++++
 .../src/main/java/mage/server/util/Config.xsd | 15 +++++++----
 .../java/mage/server/util/ConfigSettings.java | 20 ++++++++++++++
 .../mage/server/util/resources/config.xml     | 11 ++++++--
 .../main/xml-resources/jaxb/Config/Config.xsd | 15 +++++++----
 10 files changed, 127 insertions(+), 24 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 32d87684e7..d2448455b6 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -695,7 +695,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         String server = prefs.get("serverAddress", "");
         int port = Integer.parseInt(prefs.get("serverPort", ""));
         String proxyServer = prefs.get("proxyAddress", "");
-        int proxyPort = Integer.parseInt(prefs.get("proxyPort", ""));
+        int proxyPort = Integer.parseInt(prefs.get("proxyPort", "0"));
         ProxyType proxyType = ProxyType.valueByText(prefs.get("proxyType", "None"));
         String proxyUsername = prefs.get("proxyUsername", "");
         String proxyPassword = prefs.get("proxyPassword", "");
diff --git a/Mage.Common/src/mage/remote/Connection.java b/Mage.Common/src/mage/remote/Connection.java
index 80e547a2e5..1ed71907f0 100644
--- a/Mage.Common/src/mage/remote/Connection.java
+++ b/Mage.Common/src/mage/remote/Connection.java
@@ -56,9 +56,19 @@ public class Connection {
     private boolean showAbilityPickerForced;
     private UserSkipPrioritySteps userSkipPrioritySteps;
 
-    private static final String serialization = "?serializationtype=jboss";
+    private static final String serialization = "?serializationtype=jboss";    
     private static final String transport = "bisocket";
 
+    private final String parameter; 
+    
+    public Connection() {
+        this("");
+    }
+    
+    public Connection(String parameter) {
+        this.parameter = parameter;
+    }
+    
     @Override
     public int hashCode() {
         return (transport + host + Integer.toString(port) + proxyType.toString()).hashCode();    
@@ -75,7 +85,7 @@ public class Connection {
 
     @Override
     public String toString() {
-        return host + ":" + Integer.toString(port) + "/" + serialization;
+        return host + ":" + Integer.toString(port) + "/" + serialization + parameter;
     }
 
     public String getURI() {
@@ -83,13 +93,13 @@ public class Connection {
             try {
                 InetAddress inet = getLocalAddress();
                 if (inet != null) {
-                    return transport + "://" + inet.getHostAddress() + ":" + port + "/" + serialization;
+                    return transport + "://" + inet.getHostAddress() + ":" + port + "/" + serialization + parameter;
                 }
             } catch (SocketException ex) {
                 // just use localhost if can't find local ip
             }
         }
-        return transport + "://" + host + ":" + port + "/" + serialization;
+        return transport + "://" + host + ":" + port + "/" + serialization + parameter;
     }
 
     public ProxyType getProxyType() {
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index 76f5435e36..698e6a3081 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
+    <!-- 
+    serverAddress       - ip of the XMage server. Set it to "0.0.0.0" for local host or to the IP the server should use 
+    port                - the port the primary server socket is bound to 
+    secondaryBindPort   - the port to which the secondary server socket is to be bound. if "-1" is set , an arbitrary port is selected. 
+    backlogSize         - the preferred number of unaccepted incoming connections allowed at a given time. The actual number may be greater 
+                          than the specified backlog. When the queue is full, further connection requests are rejected. The JBoss default value is 200
+    numAcceptThreads    - the number of threads listening on the ServerSocket. The JBoss default value is 1 
+    maxPoolSize         - the maximum number of ServerThreads that can exist at any given time. The JBoss default value is 300 
+    leasePeriod         - To turn on server side connection failure detection of remoting clients, it is necessary to satisfy two criteria. 
+                          The first is that the client lease period is set and is a value greater than 0. The value is represented in milliseconds. 
+                          The client lease period can be set by either the 'clientLeasePeriod' attribute within the Connector configuration or by calling the Connector method
+    maxGameThreads      - Number of games that can be started simultanously on the server
+    maxSecondsIdle      - Number of seconds after that a game is auto conceded by the player that was idle for such a time
+    minUserNameLength   - minmal allowed length of a user name to connect to the server
+    maxUserNameLength   - maximal allowed length of a user name to connect to the server
+    userNamePattern     - pattern for user name validity check
+    maxAiOpponents      - number of allowed AI opponents on the server
+    saveGameActivated   - allow game save and replay options (not working correctly yet)
+    -->
     <server serverAddress="0.0.0.0"
             serverName="mage-server"
             port="17171"
+            secondaryBindPort="17179"             
+            backlogSize="200" 
+            numAcceptThreads="2" 
+            maxPoolSize="300" 
+            leasePeriod="5000"             
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index 3f78e5e4f1..5d56bef8c0 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <server serverAddress="0.0.0.0" serverName="mage-server" port="17171" 
+    <server serverAddress="0.0.0.0" 
+            serverName="mage-server" 
+            port="17171" 
+            secondaryBindPort="-1" 
+            backlogSize="200" 
+            numAcceptThreads="2" 
+            maxPoolSize="300" 
+            leasePeriod="5000" 
             maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java
index 99d967bb7f..605fdfb7b2 100644
--- a/Mage.Server/src/main/java/mage/server/Main.java
+++ b/Mage.Server/src/main/java/mage/server/Main.java
@@ -63,6 +63,7 @@ import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
+import org.jboss.remoting.transport.bisocket.BisocketServerInvoker;
 
 
 /**
@@ -106,7 +107,7 @@ public class Main {
                 fastDbMode = Boolean.valueOf(arg.replace(fastDBModeArg, ""));
             }
         }
-
+        
         logger.info("Loading cards...");
         if (fastDbMode) {
             CardScanner.scanned = true;
@@ -140,11 +141,18 @@ public class Main {
         logger.info("Config - max user name l.: " + config.getMaxUserNameLength());
         logger.info("Config - save game active: " + (config.isSaveGameActivated() ? "True":"false"));
         
-        Connection connection = new Connection();
+        logger.info("Config - backlog size    : " + config.getBacklogSize());
+        logger.info("Config - lease period    : " + config.getLeasePeriod());
+        logger.info("Config - max pool size   : " + config.getMaxPoolSize());
+        logger.info("Config - num accp.threads: " + config.getNumAcceptThreads());
+        logger.info("Config - second.bind port: " + config.getSecondaryBindPort());
+        
+        Connection connection = new Connection("&maxPoolSize=" + config.getMaxPoolSize());
         connection.setHost(config.getServerAddress());
         connection.setPort(config.getPort());
         try {
-            InvokerLocator serverLocator = new InvokerLocator(connection.getURI());
+            // Parameter: serializationtype => jboss
+            InvokerLocator serverLocator = new InvokerLocator(connection.getURI());                
             if (!isAlreadyRunning(serverLocator)) {
                 server = new MageTransporterServer(serverLocator, new MageServerImpl(adminPassword, testMode), MageServer.class.getName(), new MageServerInvocationHandler());
                 server.start();
@@ -231,7 +239,7 @@ public class Main {
         public MageTransporterServer(InvokerLocator locator, Object target, String subsystem, MageServerInvocationHandler callback) throws Exception {
             super(locator, target, subsystem);
             connector.addInvocationHandler("callback", callback);
-            connector.setLeasePeriod(5000);
+            connector.setLeasePeriod(ConfigSettings.getInstance().getLeasePeriod());
             connector.addConnectionListener(new ClientConnectionListener());
         }
 
@@ -250,10 +258,16 @@ public class Main {
     static class MageServerInvocationHandler implements ServerInvocationHandler {
 
         @Override
-        public void setMBeanServer(MBeanServer server) {}
+        public void setMBeanServer(MBeanServer server) {
+            
+        }
 
         @Override
-        public void setInvoker(ServerInvoker invoker) {}
+        public void setInvoker(ServerInvoker invoker) {            
+            ((BisocketServerInvoker) invoker).setSecondaryBindPort(ConfigSettings.getInstance().getSecondaryBindPort());
+            ((BisocketServerInvoker) invoker).setBacklog(ConfigSettings.getInstance().getBacklogSize());                        
+            ((BisocketServerInvoker) invoker).setNumAcceptThreads(ConfigSettings.getInstance().getNumAcceptThreads());            
+        }
 
         @Override
         public Object invoke(final InvocationRequest invocation) throws Throwable {
diff --git a/Mage.Server/src/main/java/mage/server/util/Config.java b/Mage.Server/src/main/java/mage/server/util/Config.java
index 153941d3fe..65cd7b7dd8 100644
--- a/Mage.Server/src/main/java/mage/server/util/Config.java
+++ b/Mage.Server/src/main/java/mage/server/util/Config.java
@@ -48,6 +48,12 @@ public class Config {
             logger.fatal("Config error", ex);
         }
         port = Integer.parseInt(p.getProperty("port"));
+        secondaryBindPort = Integer.parseInt(p.getProperty("secondaryBindPort"));
+        backlogSize = Integer.parseInt(p.getProperty("backlogSize"));
+        numAcceptThreads = Integer.parseInt(p.getProperty("numAcceptThreads"));
+        maxPoolSize = Integer.parseInt(p.getProperty("numPoolSize"));
+        leasePeriod = Integer.parseInt(p.getProperty("leasePeriod"));
+        
         remoteServer = p.getProperty("remote-server");
         maxGameThreads = Integer.parseInt(p.getProperty("max-game-threads"));
         maxSecondsIdle = Integer.parseInt(p.getProperty("max-seconds-idle"));
@@ -59,6 +65,11 @@ public class Config {
 
     public static final String remoteServer;
     public static final int port;
+    public static final int secondaryBindPort;
+    public static final int backlogSize;
+    public static final int numAcceptThreads;
+    public static final int maxPoolSize;
+    public static final int leasePeriod;
     public static final int maxGameThreads;
     public static final int maxSecondsIdle;
     public static final int minUserNameLength;
diff --git a/Mage.Server/src/main/java/mage/server/util/Config.xsd b/Mage.Server/src/main/java/mage/server/util/Config.xsd
index edc8f42138..bc0ab04a67 100644
--- a/Mage.Server/src/main/java/mage/server/util/Config.xsd
+++ b/Mage.Server/src/main/java/mage/server/util/Config.xsd
@@ -19,13 +19,18 @@
 			<xs:attribute name="serverAddress" type="xs:string" use="required"/>
 			<xs:attribute name="serverName" type="xs:string" use="required"/>
 			<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="secondaryBindPort" type="xs:integer" use="required"/>
+                        <xs:attribute name="backlogSize" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="numAcceptThreads" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="maxPoolSize" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="leasePeriod" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxGameThreads" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxSecondsIdle" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
-            <xs:attribute name="maxAiOpponents" type="xs:string" use="optional"/>
-            <xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
+                        <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
+                        <xs:attribute name="maxAiOpponents" type="xs:string" use="optional"/>
+                        <xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
 		</xs:complexType>
 	</xs:element>
 
diff --git a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
index 3b9ac6bd86..cee5d5bdee 100644
--- a/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
+++ b/Mage.Server/src/main/java/mage/server/util/ConfigSettings.java
@@ -75,6 +75,26 @@ public class ConfigSettings {
         return config.getServer().getPort().intValue();
     }
 
+    public int getSecondaryBindPort() {
+        return config.getServer().getSecondaryBindPort().intValue();
+    }
+
+    public int getLeasePeriod() {
+        return config.getServer().getLeasePeriod().intValue();
+    }
+
+    public int getMaxPoolSize() {
+        return config.getServer().getMaxPoolSize().intValue();
+    }
+
+    public int getNumAcceptThreads() {
+        return config.getServer().getNumAcceptThreads().intValue();
+    }
+
+    public int getBacklogSize() {
+        return config.getServer().getBacklogSize().intValue();
+    }
+        
     public int getMaxGameThreads() {
         return config.getServer().getMaxGameThreads().intValue();
     }
diff --git a/Mage.Server/src/main/java/mage/server/util/resources/config.xml b/Mage.Server/src/main/java/mage/server/util/resources/config.xml
index 4070ed9787..56ca070a03 100644
--- a/Mage.Server/src/main/java/mage/server/util/resources/config.xml
+++ b/Mage.Server/src/main/java/mage/server/util/resources/config.xml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
-    <server serverAddress="0.0.0.0" serverName="mage-server" port="17171" maxGameThreads="10"
+    <server serverAddress="0.0.0.0" 
+            serverName="mage-server" 
+            port="17171" 
+            secondaryBindPort="-1" 
+            backlogSize="200" 
+            numAcceptThreads="2" 
+            maxPoolSize="300" 
+            leasePeriod="5000" 
+            maxGameThreads="10"
             maxSecondsIdle="600"
             minUserNameLength="3"
             maxUserNameLength="14"
             userNamePattern="[^a-z0-9_]"
-            saveGameActivated="true"
             maxAiOpponents="15"
             saveGameActivated="false"
     />
diff --git a/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd b/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
index 106f34a1d3..8e57894338 100644
--- a/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
+++ b/Mage.Server/src/main/xml-resources/jaxb/Config/Config.xsd
@@ -22,11 +22,16 @@
 			<xs:attribute name="port" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxGameThreads" type="xs:positiveInteger" use="required"/>
 			<xs:attribute name="maxSecondsIdle" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
-            <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
-            <xs:attribute name="maxAiOpponents" type="xs:string" use="optional"/>
-            <xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
+                        <xs:attribute name="secondaryBindPort" type="xs:integer" use="required"/>
+                        <xs:attribute name="backlogSize" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="numAcceptThreads" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="maxPoolSize" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="leasePeriod" type="xs:positiveInteger" use="required"/>                        
+                        <xs:attribute name="minUserNameLength" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="maxUserNameLength" type="xs:positiveInteger" use="required"/>
+                        <xs:attribute name="userNamePattern" type="xs:string" use="required"/>
+                        <xs:attribute name="maxAiOpponents" type="xs:string" use="optional"/>
+                        <xs:attribute name="saveGameActivated" type="xs:boolean" use="optional"/>
 		</xs:complexType>
 	</xs:element>