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

12
server/modules/protocol/CDC/cdc.cc
View File

@ -151,7 +151,7 @@ static int cdc_read_event(DCB* dcb)
write_auth_ack(dcb);
MXS_INFO("%s: Client [%s] authenticated with user [%s]",
dcb->service->name,
dcb->service->name(),
dcb->remote != NULL ? dcb->remote : "",
client_data->user);
}
@ -167,7 +167,7 @@ static int cdc_read_event(DCB* dcb)
write_auth_err(dcb);
MXS_ERROR("%s: authentication failure from [%s], user [%s]",
dcb->service->name,
dcb->service->name(),
dcb->remote != NULL ? dcb->remote : "",
client_data->user);
@ -182,7 +182,7 @@ static int cdc_read_event(DCB* dcb)
if (strncmp((char*)GWBUF_DATA(head), "CLOSE", GWBUF_LENGTH(head)) == 0)
{
MXS_INFO("%s: Client [%s] has requested CLOSE action",
dcb->service->name,
dcb->service->name(),
dcb->remote != NULL ? dcb->remote : "");
// gwbuf_set_type(head, GWBUF_TYPE_CDC);
@ -198,7 +198,7 @@ static int cdc_read_event(DCB* dcb)
else
{
MXS_INFO("%s: Client [%s] requested [%.*s] action",
dcb->service->name,
dcb->service->name(),
dcb->remote != NULL ? dcb->remote : "",
(int)GWBUF_LENGTH(head),
(char*)GWBUF_DATA(head));
@ -210,7 +210,7 @@ static int cdc_read_event(DCB* dcb)
default:
MXS_INFO("%s: Client [%s] in unknown state %d",
dcb->service->name,
dcb->service->name(),
dcb->remote != NULL ? dcb->remote : "",
protocol->state);
gwbuf_free(head);
@ -316,7 +316,7 @@ static int cdc_accept(DCB* client_dcb)
protocol->state = CDC_STATE_WAIT_FOR_AUTH;
MXS_NOTICE("%s: new connection from [%s]",
client_dcb->service->name,
client_dcb->service->name(),
client_dcb->remote != NULL ? client_dcb->remote : "");
return 1;