hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2246 Remove duplicate info in SERVICE and Service

Browse Source 
Both of them contained fields for the service and router names.
Now the names are in SERVICE and they must be accessed via member
function.
This commit is contained in:
Johan Wikman
2019-02-14 10:25:04 +02:00
parent 2528c5fa4d
commit 1fed465fdb
32 changed files with 294 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/dbfwfilter/dbfwfilter.cc
View File

@ -1519,7 +1519,7 @@ int DbfwSession::routeQuery(GWBUF* buffer)
if (match && m_instance->get_log_bitmask() & FW_LOG_MATCH)
{
MXS_NOTICE("[%s] Rule '%s' for '%s' matched by %s@%s: %s",
m_session->service->name,
m_session->service->name(),
rname,
suser->name(),
user().c_str(),
@ -1529,7 +1529,7 @@ int DbfwSession::routeQuery(GWBUF* buffer)
else if (!match && m_instance->get_log_bitmask() & FW_LOG_NO_MATCH)
{
MXS_NOTICE("[%s] Query for '%s' by %s@%s was not matched: %s",
m_session->service->name,
m_session->service->name(),
suser->name(),
user().c_str(),
remote().c_str(),

2
server/modules/filter/qlafilter/qlafilter.cc
View File

@ -190,7 +190,7 @@ QlaFilterSession::QlaFilterSession(QlaInstance& instance, MXS_SESSION* session)
: m_instance(instance)
, m_user(session_get_user(session))
, m_remote(session_get_remote(session))
, m_service(session->service->name)
, m_service(session->service->name())
, m_ses_id(session->ses_id)
{
}

4
server/modules/filter/tee/tee.cc
View File

@ -112,7 +112,7 @@ void Tee::diagnostics(DCB* dcb)
}
dcb_printf(dcb,
"\t\tDuplicate statements to service %s\n",
m_service->name);
m_service->name());
if (m_user.length())
{
dcb_printf(dcb,
@ -153,7 +153,7 @@ json_t* Tee::diagnostics_json() const
json_object_set_new(rval, "source", json_string(m_source.c_str()));
}
json_object_set_new(rval, "service", json_string(m_service->name));
json_object_set_new(rval, "service", json_string(m_service->name()));
if (m_user.length())
{

2
server/modules/filter/tee/teesession.cc
View File

@ -63,7 +63,7 @@ TeeSession* TeeSession::create(Tee* my_instance, MXS_SESSION* session)
const char* extra = !listener_find_by_service(my_instance->get_service()).empty() ? "" :
": Service has no network listeners";
MXS_ERROR("Failed to create local client connection to '%s'%s",
my_instance->get_service()->name, extra);
my_instance->get_service()->name(), extra);
return NULL;
}
}