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 2018/07/18 15:49:12 UTC
qpid-dispatch git commit: DISPATCH-1082: Add connection_id to log
messages for disambiguation
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 1b39fff04 -> f6a68fd14
DISPATCH-1082: Add connection_id to log messages for disambiguation
Eleven log messages are prefixed with '[N]'.
Server on_accept log message deletes the from field as it is unknown
at this stage in the connection life cycle and always blank.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f6a68fd1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f6a68fd1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f6a68fd1
Branch: refs/heads/master
Commit: f6a68fd14db5a47f2ef6ea3ae7057309b41dc83d
Parents: 1b39fff
Author: Chuck Rolke <cr...@redhat.com>
Authored: Wed Jul 18 11:46:44 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Wed Jul 18 11:46:44 2018 -0400
----------------------------------------------------------------------
src/policy.c | 36 ++++++++++++++++++------------------
src/server.c | 16 ++++++++--------
2 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f6a68fd1/src/policy.c
----------------------------------------------------------------------
diff --git a/src/policy.c b/src/policy.c
index 21038d8..9bdbffa 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -460,8 +460,8 @@ bool qd_policy_open_lookup_user(
if (name_buf[0]) {
qd_log(policy->log_source,
QD_LOG_TRACE,
- "ALLOW AMQP Open lookup_user: %s, rhost: %s, vhost: %s, connection: %s. Usergroup: '%s'%s",
- username, hostip, vhost, conn_name, name_buf, (res ? "" : " Internal error."));
+ "[%"PRIu64"]: ALLOW AMQP Open lookup_user: %s, rhost: %s, vhost: %s, connection: %s. Usergroup: '%s'%s",
+ conn_id, username, hostip, vhost, conn_name, name_buf, (res ? "" : " Internal error."));
} else {
// Denials are logged in python code
}
@@ -515,13 +515,13 @@ bool qd_policy_approve_amqp_session(pn_session_t *ssn, qd_connection_t *qd_conn)
if (result) {
qd_log(policy->log_source,
QD_LOG_TRACE,
- "ALLOW AMQP Begin Session. user: %s, rhost: %s, vhost: %s",
- qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: ALLOW AMQP Begin Session. user: %s, rhost: %s, vhost: %s",
+ qd_conn->connection_id, qd_conn->user_id, hostip, vhost);
} else {
qd_log(policy->log_source,
QD_LOG_INFO,
- "DENY AMQP Begin Session due to session limit. user: %s, rhost: %s, vhost: %s",
- qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: DENY AMQP Begin Session due to session limit. user: %s, rhost: %s, vhost: %s",
+ qd_conn->connection_id, qd_conn->user_id, hostip, vhost);
}
return result;
}
@@ -867,8 +867,8 @@ bool qd_policy_approve_amqp_sender_link(pn_link_t *pn_link, qd_connection_t *qd_
if (qd_conn->n_senders == qd_conn->policy_settings->maxSenders) {
// Max sender limit specified and violated.
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, QD_LOG_INFO,
- "DENY AMQP Attach sender for user '%s', rhost '%s', vhost '%s' based on maxSenders limit",
- qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: DENY AMQP Attach sender for user '%s', rhost '%s', vhost '%s' based on maxSenders limit",
+ qd_conn->connection_id, qd_conn->user_id, hostip, vhost);
_qd_policy_deny_amqp_sender_link(pn_link, qd_conn, QD_AMQP_COND_RESOURCE_LIMIT_EXCEEDED);
return false;
} else {
@@ -885,8 +885,8 @@ bool qd_policy_approve_amqp_sender_link(pn_link_t *pn_link, qd_connection_t *qd_
lookup = qd_policy_approve_link_name(qd_conn->user_id, qd_conn->policy_settings, target, false);
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, (lookup ? QD_LOG_TRACE : QD_LOG_INFO),
- "%s AMQP Attach sender link '%s' for user '%s', rhost '%s', vhost '%s' based on link target name",
- (lookup ? "ALLOW" : "DENY"), target, qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: %s AMQP Attach sender link '%s' for user '%s', rhost '%s', vhost '%s' based on link target name",
+ qd_conn->connection_id, (lookup ? "ALLOW" : "DENY"), target, qd_conn->user_id, hostip, vhost);
if (!lookup) {
_qd_policy_deny_amqp_sender_link(pn_link, qd_conn, QD_AMQP_COND_UNAUTHORIZED_ACCESS);
@@ -897,8 +897,8 @@ bool qd_policy_approve_amqp_sender_link(pn_link_t *pn_link, qd_connection_t *qd_
// This happens all the time with anonymous relay
lookup = qd_conn->policy_settings->allowAnonymousSender;
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, (lookup ? QD_LOG_TRACE : QD_LOG_INFO),
- "%s AMQP Attach anonymous sender for user '%s', rhost '%s', vhost '%s'",
- (lookup ? "ALLOW" : "DENY"), qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: %s AMQP Attach anonymous sender for user '%s', rhost '%s', vhost '%s'",
+ qd_conn->connection_id, (lookup ? "ALLOW" : "DENY"), qd_conn->user_id, hostip, vhost);
if (!lookup) {
_qd_policy_deny_amqp_sender_link(pn_link, qd_conn, QD_AMQP_COND_UNAUTHORIZED_ACCESS);
return false;
@@ -918,8 +918,8 @@ bool qd_policy_approve_amqp_receiver_link(pn_link_t *pn_link, qd_connection_t *q
if (qd_conn->n_receivers == qd_conn->policy_settings->maxReceivers) {
// Max sender limit specified and violated.
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, QD_LOG_INFO,
- "DENY AMQP Attach receiver for user '%s', rhost '%s', vhost '%s' based on maxReceivers limit",
- qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: DENY AMQP Attach receiver for user '%s', rhost '%s', vhost '%s' based on maxReceivers limit",
+ qd_conn->connection_id, qd_conn->user_id, hostip, vhost);
_qd_policy_deny_amqp_receiver_link(pn_link, qd_conn, QD_AMQP_COND_RESOURCE_LIMIT_EXCEEDED);
return false;
} else {
@@ -933,8 +933,8 @@ bool qd_policy_approve_amqp_receiver_link(pn_link_t *pn_link, qd_connection_t *q
if (dynamic_src) {
bool lookup = qd_conn->policy_settings->allowDynamicSource;
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, (lookup ? QD_LOG_TRACE : QD_LOG_INFO),
- "%s AMQP Attach receiver dynamic source for user '%s', rhost '%s', vhost '%s',",
- (lookup ? "ALLOW" : "DENY"), qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: %s AMQP Attach receiver dynamic source for user '%s', rhost '%s', vhost '%s',",
+ qd_conn->connection_id, (lookup ? "ALLOW" : "DENY"), qd_conn->user_id, hostip, vhost);
// Dynamic source policy rendered the decision
if (!lookup) {
_qd_policy_deny_amqp_receiver_link(pn_link, qd_conn, QD_AMQP_COND_UNAUTHORIZED_ACCESS);
@@ -947,8 +947,8 @@ bool qd_policy_approve_amqp_receiver_link(pn_link_t *pn_link, qd_connection_t *q
bool lookup = qd_policy_approve_link_name(qd_conn->user_id, qd_conn->policy_settings, source, true);
qd_log(qd_server_dispatch(qd_conn->server)->policy->log_source, (lookup ? QD_LOG_TRACE : QD_LOG_INFO),
- "%s AMQP Attach receiver link '%s' for user '%s', rhost '%s', vhost '%s' based on link source name",
- (lookup ? "ALLOW" : "DENY"), source, qd_conn->user_id, hostip, vhost);
+ "[%"PRIu64"]: %s AMQP Attach receiver link '%s' for user '%s', rhost '%s', vhost '%s' based on link source name",
+ qd_conn->connection_id, (lookup ? "ALLOW" : "DENY"), source, qd_conn->user_id, hostip, vhost);
if (!lookup) {
_qd_policy_deny_amqp_receiver_link(pn_link, qd_conn, QD_AMQP_COND_UNAUTHORIZED_ACCESS);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f6a68fd1/src/server.c
----------------------------------------------------------------------
diff --git a/src/server.c b/src/server.c
index 2ad6f6d..b698fab 100644
--- a/src/server.c
+++ b/src/server.c
@@ -544,8 +544,8 @@ static void on_accept(pn_event_t *e)
}
ctx->listener = listener;
qd_log(listener->server->log_source, QD_LOG_TRACE,
- "[%"PRIu64"] Accepting incoming connection from %s to %s",
- ctx->connection_id, qd_connection_name(ctx), ctx->listener->config.host_port);
+ "[%"PRIu64"]: Accepting incoming connection to '%s'",
+ ctx->connection_id, ctx->listener->config.host_port);
/* Asynchronous accept, configure the transport on PN_CONNECTION_BOUND */
pn_listener_accept(pn_listener, ctx->pn_conn);
}
@@ -652,8 +652,8 @@ static void on_connection_bound(qd_server_t *server, pn_event_t *e) {
pn_sasl_set_allow_insecure_mechs(sasl, config->allowInsecureAuthentication);
sys_mutex_unlock(ctx->server->lock);
- qd_log(ctx->server->log_source, QD_LOG_INFO, "Accepted connection to %s from %s",
- name, ctx->rhost_port);
+ qd_log(ctx->server->log_source, QD_LOG_INFO, "[%"PRIu64"]: Accepted connection to %s from %s",
+ ctx->connection_id, name, ctx->rhost_port);
} else if (ctx->connector) { /* Establishing an outgoing connection */
config = &ctx->connector->config;
setup_ssl_sasl_and_open(ctx);
@@ -924,15 +924,15 @@ static bool handle(qd_server_t *qd_server, pn_event_t *e) {
qd_increment_conn_index(ctx);
const qd_server_config_t *config = &ctx->connector->config;
if (condition && pn_condition_is_set(condition)) {
- qd_log(qd_server->log_source, QD_LOG_INFO, "Connection to %s failed: %s %s", config->host_port,
+ qd_log(qd_server->log_source, QD_LOG_INFO, "[%"PRIu64"]: Connection to %s failed: %s %s", ctx->connection_id, config->host_port,
pn_condition_get_name(condition), pn_condition_get_description(condition));
} else {
- qd_log(qd_server->log_source, QD_LOG_INFO, "Connection to %s failed", config->host_port);
+ qd_log(qd_server->log_source, QD_LOG_INFO, "[%"PRIu64"]: Connection to %s failed", ctx->connection_id, config->host_port);
}
} else if (ctx && ctx->listener) { /* Incoming connection */
if (condition && pn_condition_is_set(condition)) {
- qd_log(ctx->server->log_source, QD_LOG_INFO, "Connection from %s (to %s) failed: %s %s",
- ctx->rhost_port, ctx->listener->config.host_port, pn_condition_get_name(condition),
+ qd_log(ctx->server->log_source, QD_LOG_INFO, "[%"PRIu64"]: Connection from %s (to %s) failed: %s %s",
+ ctx->connection_id, ctx->rhost_port, ctx->listener->config.host_port, pn_condition_get_name(condition),
pn_condition_get_description(condition));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org