GUACAMOLE-102: Finish adding connection weight attribute.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/4aff2c1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/4aff2c1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/4aff2c1b Branch: refs/heads/master Commit: 4aff2c1bb871545f5853f58760058e0d5b787d3f Parents: 025f77d Author: Nick Couchman <vn...@apache.org> Authored: Sun Mar 19 16:24:56 2017 -0400 Committer: Nick Couchman <nick.couch...@yahoo.com> Committed: Mon Jun 5 15:34:21 2017 -0400 ---------------------------------------------------------------------- .../guacamole/auth/jdbc/JDBCEnvironment.java | 2 +- .../auth/jdbc/connection/ModeledConnection.java | 5 ++-- .../src/main/resources/translations/en.json | 1 + .../guacamole/auth/mysql/MySQLEnvironment.java | 1 + .../auth/mysql/MySQLGuacamoleProperties.java | 2 +- .../schema/001-create-schema.sql | 3 +++ .../schema/upgrade/upgrade-pre-0.9.12.sql | 25 ++++++++++++++++++++ .../auth/postgresql/PostgreSQLEnvironment.java | 1 + 8 files changed, 36 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java index 64f2449..a856d2a 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/JDBCEnvironment.java @@ -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 http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java index 93a7329..aa79ba4 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/connection/ModeledConnection.java @@ -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) )); /** http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json index bf73c35..c154d8b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json @@ -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:", http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java index 63d4ae3..6495fcc 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLEnvironment.java @@ -90,6 +90,7 @@ public class MySQLEnvironment extends JDBCEnvironment { /** * The default value for the connection weight for a connection in * a balancing group. + */ private int DEFAULT_CONNECTION_WEIGHT = 0; /** http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java index 79f3e7f..3c88a59 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLGuacamoleProperties.java @@ -181,7 +181,7 @@ public class MySQLGuacamoleProperties { MYSQL_DEFAULT_CONNECTION_WEIGHT = new IntegerGuacamoleProperty() { - @Overide + @Override public String getName() { return "mysql-default-connection-weight"; } }; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql index e018617..7b9081e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/001-create-schema.sql @@ -106,6 +106,9 @@ CREATE TABLE guacamole_connection ( max_connections integer, max_connections_per_user integer, + -- Connection Weight + connection_weight integer, + -- Guacamole proxy (guacd) overrides proxy_port integer, proxy_hostname varchar(512), http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.12.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.12.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.12.sql new file mode 100644 index 0000000..1f085a4 --- /dev/null +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-0.9.12.sql @@ -0,0 +1,25 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + +-- +-- Add per-user password set date +-- + +ALTER TABLE guacamole_connection + ADD COLUMN connection_weight int; http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/4aff2c1b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java index 5399417..e0ad4ec 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLEnvironment.java @@ -90,6 +90,7 @@ public class PostgreSQLEnvironment extends JDBCEnvironment { /** * The default value for the connection weight for a connection in * a balancing group. + */ private int DEFAULT_CONNECTION_WEIGHT = 0; /**
