safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-102: Finish adding connection weight attribute.

Browse Source
This commit is contained in:
Nick Couchman
2017-03-19 16:24:56 -04:00
committed by Nick Couchman
parent 025f77d1c4
commit 4aff2c1bb8
8 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java
View File

@@ -91,7 +91,7 @@ public abstract class JDBCEnvironment extends LocalEnvironment {
* @throws GuacamoleException
* If an error occurs while retrieving the property.
*/
public abstract int getConnectionWeight() throws GuacamoleException;
public abstract int getDefaultConnectionWeight() throws GuacamoleException;
/**
* Returns the default maximum number of concurrent connections to allow to

5
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java
View File

@@ -119,7 +119,7 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
/**
* The connection weight for the WRR algorithm.
*/
public static final String CONNECTION_WEIGHT = "connection-weight";
public static final String CONNECTION_WEIGHT = "weight";
/**
* All attributes related to restricting user accounts, within a logical
@@ -127,7 +127,8 @@ public class ModeledConnection extends ModeledChildDirectoryObject<ConnectionMod
*/
public static final Form CONCURRENCY_LIMITS = new Form("concurrency", Arrays.<Field>asList(
new NumericField(MAX_CONNECTIONS_NAME),
new NumericField(MAX_CONNECTIONS_PER_USER_NAME)
new NumericField(MAX_CONNECTIONS_PER_USER_NAME),
new NumericField(CONNECTION_WEIGHT)
));
/**

1
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
View File

@@ -19,6 +19,7 @@
"FIELD_HEADER_MAX_CONNECTIONS" : "Maximum number of connections:",
"FIELD_HEADER_MAX_CONNECTIONS_PER_USER" : "Maximum number of connections per user:",
"FIELD_HEADER_WEIGHT" : "Connection Weight for Load Balancing:",
"FIELD_HEADER_GUACD_HOSTNAME" : "Hostname:",
"FIELD_HEADER_GUACD_ENCRYPTION" : "Encryption:",