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

Added message printing telling what file provided the module which was loaded.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-05-17 23:10:03 +02:00
parent bb364f531b
commit 5c39682e40
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/load_utils.c
View File

@ -106,6 +106,7 @@ MODULES *mod;
return NULL; return NULL;
} }
} }
if ((dlhandle = dlopen(fname, RTLD_NOW|RTLD_LOCAL)) == NULL) if ((dlhandle = dlopen(fname, RTLD_NOW|RTLD_LOCAL)) == NULL)
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
@ -156,9 +157,10 @@ MODULES *mod;
LOGIF(LM, (skygw_log_write_flush( LOGIF(LM, (skygw_log_write_flush(
LOGFILE_MESSAGE, LOGFILE_MESSAGE,
"Loaded module %s: %s.", "Loaded module %s: %s from %s",
module, module,
version))); version,
fname)));
register_module(module, type, dlhandle, version, modobj); register_module(module, type, dlhandle, version, modobj);
} }
else else

3
server/modules/protocol/mysql_client.c
View File

@ -36,7 +36,6 @@
* 07/05/2014 Massimiliano Pinto Added: specific version string in server handshake * 07/05/2014 Massimiliano Pinto Added: specific version string in server handshake
* *
*/ */
#include <skygw_utils.h> #include <skygw_utils.h>
#include <log_manager.h> #include <log_manager.h>
#include <mysql_client_server_protocol.h> #include <mysql_client_server_protocol.h>
@ -511,7 +510,6 @@ int gw_read_client_event(DCB* dcb) {
int b = -1; int b = -1;
int rc = 0; int rc = 0;
int nbytes_read = 0; int nbytes_read = 0;
CHK_DCB(dcb); CHK_DCB(dcb);
protocol = DCB_PROTOCOL(dcb, MySQLProtocol); protocol = DCB_PROTOCOL(dcb, MySQLProtocol);
CHK_PROTOCOL(protocol); CHK_PROTOCOL(protocol);
@ -562,7 +560,6 @@ int gw_read_client_event(DCB* dcb) {
goto return_rc; goto return_rc;
} }
rc = gw_read_gwbuff(dcb, &read_buffer, b); rc = gw_read_gwbuff(dcb, &read_buffer, b);
if (rc != 0) { if (rc != 0) {