You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2016/01/04 23:30:43 UTC
[1/4] qpid-dispatch git commit: add database string to base config
Repository: qpid-dispatch
Updated Branches:
refs/heads/foo-pol-01 [created] ed925a919
add database string to base config
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1b95b4f2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1b95b4f2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1b95b4f2
Branch: refs/heads/foo-pol-01
Commit: 1b95b4f27910cd02f0d88bd7cefa10611424c03c
Parents: 3256a51
Author: Chuck Rolke <cr...@redhat.com>
Authored: Mon Dec 21 15:32:52 2015 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Mon Dec 21 15:32:52 2015 -0500
----------------------------------------------------------------------
python/qpid_dispatch/management/qdrouter.json | 6 ++++++
src/policy.c | 14 +++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1b95b4f2/python/qpid_dispatch/management/qdrouter.json
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json
index 74f9b77..eb8e599 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1012,6 +1012,12 @@
"required": false,
"create": true
},
+ "policyDb": {
+ "type": "path",
+ "description": "The path to the folder that holds policy definition files.",
+ "required": false,
+ "create": true
+ },
"connectionsProcessed": {"type": "integer", "graph": true},
"connectionsDenied": {"type": "integer", "graph": true},
"connectionsCurrent": {"type": "integer", "graph": true}
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1b95b4f2/src/policy.c
----------------------------------------------------------------------
diff --git a/src/policy.c b/src/policy.c
index dbade77..45908bd 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -88,6 +88,7 @@ struct qd_policy_t {
qd_log_source_t *log_source;
// configured settings
int max_connection_limit;
+ char *policyDb;
// live statistics
int connections_processed;
int connections_denied;
@@ -102,6 +103,7 @@ qd_policy_t *qd_policy(qd_dispatch_t *qd)
policy->qd = qd;
policy->log_source = qd_log_source("POLICY");
policy->max_connection_limit = 0;
+ policy->policyDb = 0;
policy->connections_processed= 0;
policy->connections_denied = 0;
policy->connections_current = 0;
@@ -113,18 +115,28 @@ qd_policy_t *qd_policy(qd_dispatch_t *qd)
void qd_policy_free(qd_policy_t *policy)
{
+ if (policy->policyDb)
+ free(policy->policyDb);
free(policy);
}
+#define CHECK() if (qd_error_code()) goto error
+
//
//
qd_error_t qd_entity_configure_policy(qd_policy_t *policy, qd_entity_t *entity)
{
- policy->max_connection_limit = qd_entity_opt_long(entity, "maximumConnections", 0); QD_ERROR_RET();
+ policy->max_connection_limit = qd_entity_opt_long(entity, "maximumConnections", 0); CHECK();
if (policy->max_connection_limit < 0)
return qd_error(QD_ERROR_CONFIG, "maximumConnections must be >= 0");
+ policy->policyDb =
+ qd_entity_opt_string(entity, "policyDb", 0); CHECK();
qd_log(policy->log_source, QD_LOG_INFO, "Configured maximumConnections: %d", policy->max_connection_limit);
return QD_ERROR_NONE;
+
+error:
+ qd_policy_free(policy);
+ return qd_error_code();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/4] qpid-dispatch git commit: Rename Policy to PolicyLocal
Posted by ch...@apache.org.
Rename Policy to PolicyLocal
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f9e76138
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f9e76138
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f9e76138
Branch: refs/heads/foo-pol-01
Commit: f9e76138ab96dcaf5eb4cb0400ef0eaa838af600
Parents: 5f89f0f
Author: Chuck Rolke <cr...@redhat.com>
Authored: Tue Dec 22 14:34:40 2015 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Tue Dec 22 14:34:40 2015 -0500
----------------------------------------------------------------------
python/qpid_dispatch_internal/management/policy.py | 6 +++---
tests/system_tests_policy.py | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f9e76138/python/qpid_dispatch_internal/management/policy.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/management/policy.py b/python/qpid_dispatch_internal/management/policy.py
index 185b60c..af5bb6a 100644
--- a/python/qpid_dispatch_internal/management/policy.py
+++ b/python/qpid_dispatch_internal/management/policy.py
@@ -353,7 +353,7 @@ class PolicyCompiler():
return False
return True
-class Policy():
+class PolicyLocal():
"""
The policy database.
"""
@@ -725,7 +725,7 @@ def main_except(argv):
(options, args) = parser.parse_args()
- policy = Policy(options.folder)
+ policy = PolicyLocal(options.folder)
print("policy names: %s" % policy.policy_db_get_names())
@@ -734,7 +734,7 @@ def main_except(argv):
# Exercise a few functions
# Empty policy
- policy2 = Policy()
+ policy2 = PolicyLocal()
print("Policy details:")
for pname in policy.policy_db_get_names():
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f9e76138/tests/system_tests_policy.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index 0ef7356..46a20d2 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -32,8 +32,7 @@ from system_test import TIMEOUT
from qpid_dispatch_internal.management.policy_util import \
HostAddr, PolicyError, HostStruct, PolicyAppConnectionMgr
-from qpid_dispatch_internal.management.policy import \
- Policy
+from qpid_dispatch_internal.management.policy import PolicyLocal
class AbsoluteConnectionCountLimit(TestCase):
"""
@@ -163,7 +162,7 @@ class PolicyHostAddrTest(TestCase):
class PolicyFile(TestCase):
- policy = Policy("../../../tests/policy-1")
+ policy = PolicyLocal("../../../tests/policy-1")
def dict_compare(self, d1, d2):
d1_keys = set(d1.keys())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/4] qpid-dispatch git commit: add a writeup with diagrams and such
Posted by ch...@apache.org.
add a writeup with diagrams and such
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ed925a91
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ed925a91
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ed925a91
Branch: refs/heads/foo-pol-01
Commit: ed925a91908d2ca396a8009ef727d7f747076c11
Parents: f9e7613
Author: Chuck Rolke <cr...@redhat.com>
Authored: Mon Jan 4 17:30:32 2016 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Mon Jan 4 17:30:32 2016 -0500
----------------------------------------------------------------------
doc/notes/qdr-policy-01.odt | Bin 0 -> 27102 bytes
doc/notes/qdr-policy-01.pdf | Bin 0 -> 89161 bytes
doc/notes/qdr-policy-diagrams-01.odg | Bin 0 -> 21121 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ed925a91/doc/notes/qdr-policy-01.odt
----------------------------------------------------------------------
diff --git a/doc/notes/qdr-policy-01.odt b/doc/notes/qdr-policy-01.odt
new file mode 100644
index 0000000..e7f267b
Binary files /dev/null and b/doc/notes/qdr-policy-01.odt differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ed925a91/doc/notes/qdr-policy-01.pdf
----------------------------------------------------------------------
diff --git a/doc/notes/qdr-policy-01.pdf b/doc/notes/qdr-policy-01.pdf
new file mode 100644
index 0000000..9501915
Binary files /dev/null and b/doc/notes/qdr-policy-01.pdf differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ed925a91/doc/notes/qdr-policy-diagrams-01.odg
----------------------------------------------------------------------
diff --git a/doc/notes/qdr-policy-diagrams-01.odg b/doc/notes/qdr-policy-diagrams-01.odg
new file mode 100644
index 0000000..d1f0030
Binary files /dev/null and b/doc/notes/qdr-policy-diagrams-01.odg differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/4] qpid-dispatch git commit: add database string to base config
Posted by ch...@apache.org.
add database string to base config
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/5f89f0f9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/5f89f0f9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/5f89f0f9
Branch: refs/heads/foo-pol-01
Commit: 5f89f0f93d14c4499c47eac467ae22c28804b6b6
Parents: 1b95b4f
Author: Chuck Rolke <cr...@redhat.com>
Authored: Mon Dec 21 15:34:13 2015 -0500
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Mon Dec 21 15:34:13 2015 -0500
----------------------------------------------------------------------
src/dispatch.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/5f89f0f9/src/dispatch.c
----------------------------------------------------------------------
diff --git a/src/dispatch.c b/src/dispatch.c
index 15b3b97..765918a 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -143,7 +143,10 @@ qd_error_t qd_dispatch_configure_lrp(qd_dispatch_t *qd, qd_entity_t *entity) {
qd_error_t qd_dispatch_configure_policy(qd_dispatch_t *qd, qd_entity_t *entity)
{
- qd_entity_configure_policy(qd->policy, entity);
+ qd_error_t err;
+ err = qd_entity_configure_policy(qd->policy, entity);
+ if (err)
+ return err;
return QD_ERROR_NONE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org