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

Fixed error messages not being printed and cleaned up the function.

Browse Source
This commit is contained in:
Markus Makela
2015-09-17 07:13:24 +03:00
parent 561891aac5
commit 988a8d7008
1 changed files with 161 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1331,58 +1331,66 @@ return_1:
} }
/** /**
* set listener for mysql protocol, retur 1 on success and 0 in failure * Bind the DCB to a network port or a UNIX Domain Socket.
* @param listen_dcb Listener DCB
* @param config_bind Bind address in either IP:PORT format for network sockets or PATH for UNIX Domain Sockets
* @return 1 on success, 0 on error
*/ */
int gw_MySQLListener( int gw_MySQLListener(DCB *listen_dcb,
DCB *listen_dcb,
char *config_bind) char *config_bind)
{ {
int l_so; int l_so;
int syseno = 0;
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
struct sockaddr_un local_addr; struct sockaddr_un local_addr;
struct sockaddr *current_addr; struct sockaddr *current_addr;
int one = 1; int one = 1;
int rc; int rc;
bool is_tcp = false; bool is_tcp = false;
memset(&serv_addr,0,sizeof(serv_addr)); memset(&serv_addr, 0, sizeof (serv_addr));
memset(&local_addr,0,sizeof(local_addr)); memset(&local_addr, 0, sizeof (local_addr));
if (strchr(config_bind, '/')) { if (strchr(config_bind, '/'))
{
char *tmp = strrchr(config_bind, ':'); char *tmp = strrchr(config_bind, ':');
if (tmp) if (tmp)
*tmp = '\0'; *tmp = '\0';
// UNIX socket create // UNIX socket create
if ((l_so = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { if ((l_so = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE,
"\n* Error: can't create UNIX socket due " "Error: Can't create UNIX socket: %i, %s",
"error %i, %s.\n\n\t",
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof (errbuf)));
return 0; return 0;
} }
memset(&local_addr, 0, sizeof(local_addr)); memset(&local_addr, 0, sizeof (local_addr));
local_addr.sun_family = AF_UNIX; local_addr.sun_family = AF_UNIX;
strncpy(local_addr.sun_path, config_bind, sizeof(local_addr.sun_path) - 1); strncpy(local_addr.sun_path, config_bind, sizeof (local_addr.sun_path) - 1);
current_addr = (struct sockaddr *) &local_addr; current_addr = (struct sockaddr *) &local_addr;
} else { }
/* MaxScale, as default, will bind on port 4406 */ else
if (!parse_bindconfig(config_bind, 4406, &serv_addr)) { {
fprintf(stderr, "Error in parse_bindconfig for [%s]\n", config_bind); /* This is partially dead code, MaxScale will never start without explicit
* ports defined for all listeners. Thus the default port is never used.
*/
if (!parse_bindconfig(config_bind, 4406, &serv_addr))
{
skygw_log_write(LE, "Error in parse_bindconfig for [%s]", config_bind);
return 0; return 0;
} }
// TCP socket create
if ((l_so = socket(AF_INET, SOCK_STREAM, 0)) < 0) { /** Create the TCP socket */
if ((l_so = socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE,
"\n* Error: can't create socket due " "Error: Can't create socket: %i, %s",
"error %i, %s.\n\n\t",
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof (errbuf)));
return 0; return 0;
} }
@ -1393,94 +1401,108 @@ int gw_MySQLListener(
listen_dcb->fd = -1; listen_dcb->fd = -1;
// socket options // socket options
if((syseno = setsockopt(l_so, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one))) != 0){ if (setsockopt(l_so, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof (one)) != 0)
char errbuf[STRERROR_BUFLEN];
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s", errno, strerror_r(errno, errbuf, sizeof(errbuf)))));
}
if(is_tcp)
{ {
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
if((syseno = setsockopt(l_so, IPPROTO_TCP, TCP_NODELAY, (char *)&one, sizeof(one))) != 0){ LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "Error: Failed to set socket options. Error %d: %s", errno, strerror_r(errno, errbuf, sizeof (errbuf)))));
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s", errno, strerror_r(errno, errbuf, sizeof(errbuf))))); }
if (is_tcp)
{
char errbuf[STRERROR_BUFLEN];
if (setsockopt(l_so, IPPROTO_TCP, TCP_NODELAY, (char *) &one, sizeof (one)) != 0)
{
LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR, "Error: Failed to set socket options. Error %d: %s", errno, strerror_r(errno, errbuf, sizeof (errbuf)))));
} }
} }
// set NONBLOCKING mode // set NONBLOCKING mode
setnonblocking(l_so); if (setnonblocking(l_so) != 0)
{
/* get the right socket family for bind */ skygw_log_write(LE, "Error: Failed to set socket to non-blocking mode.");
switch (current_addr->sa_family) { close(l_so);
case AF_UNIX: return 0;
rc = unlink(config_bind);
if ( (rc == -1) && (errno!=ENOENT) ) {
fprintf(stderr, "Error unlink Unix Socket %s\n", config_bind);
} }
if (bind(l_so, (struct sockaddr *) &local_addr, sizeof(local_addr)) < 0) { /* get the right socket family for bind */
switch (current_addr->sa_family)
{
case AF_UNIX:
rc = unlink(config_bind);
if ((rc == -1) && (errno != ENOENT))
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE, "Error: Failed to unlink Unix Socket %s: %d %s",
"\n* Bind failed due error %i, %s.\n", config_bind, errno, strerror_r(errno, errbuf, sizeof (errbuf)));
}
if (bind(l_so, (struct sockaddr *) &local_addr, sizeof (local_addr)) < 0)
{
char errbuf[STRERROR_BUFLEN];
skygw_log_write(LE,
"Error: Failed to bind to UNIX Domain socket '%s': %i, %s",
config_bind,
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof (errbuf)));
fprintf(stderr, "* Can't bind to %s\n\n", config_bind);
close(l_so); close(l_so);
return 0; return 0;
} }
/* set permission for all users */ /* set permission for all users */
if (chmod(config_bind, 0777) < 0) { if (chmod(config_bind, 0777) < 0)
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE,
"\n* chmod failed for %s due error %i, %s.\n\n", "Error: Failed to change permissions on UNIX Domain socket '%s': %i, %s",
config_bind, config_bind,
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof (errbuf)));
} }
break; break;
case AF_INET: case AF_INET:
if (bind(l_so, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) { if (bind(l_so, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) < 0)
{
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE,
"\n* Bind failed due error %i, %s.\n", "Error: Failed to bind on '%s': %i, %s",
config_bind,
errno, errno,
strerror_r(errno, errbuf, sizeof(errbuf))); strerror_r(errno, errbuf, sizeof (errbuf)));
fprintf(stderr, "* Can't bind to %s\n\n", config_bind);
close(l_so); close(l_so);
return 0; return 0;
} }
break; break;
default: default:
fprintf(stderr, "* Socket Family %i not supported\n", current_addr->sa_family); skygw_log_write(LE, "Error: Socket Family %i not supported\n", current_addr->sa_family);
close(l_so); close(l_so);
return 0; return 0;
} }
rc = listen(l_so, 10 * SOMAXCONN); if (listen(l_so, 10 * SOMAXCONN) != 0)
{
if (rc == 0) {
LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE,"Listening MySQL connections at %s", config_bind)));
} else {
int eno = errno;
errno = 0;
char errbuf[STRERROR_BUFLEN]; char errbuf[STRERROR_BUFLEN];
fprintf(stderr, skygw_log_write(LE,
"\n* Failed to start listening MySQL due error %d, %s\n\n", "Failed to start listening on '%s': %d, %s",
eno, config_bind,
strerror_r(eno, errbuf, sizeof(errbuf))); errno,
strerror_r(errno, errbuf, sizeof (errbuf)));
close(l_so); close(l_so);
return 0; return 0;
} }
LOGIF(LM, (skygw_log_write_flush(LOGFILE_MESSAGE, "Listening MySQL connections at %s", config_bind)));
// assign l_so to dcb // assign l_so to dcb
listen_dcb->fd = l_so; listen_dcb->fd = l_so;
// add listening socket to poll structure // add listening socket to poll structure
if (poll_add_dcb(listen_dcb) == -1) { if (poll_add_dcb(listen_dcb) != 0)
fprintf(stderr, {
"\n* MaxScale encountered system limit while " skygw_log_write(LE,
"attempting to register on an epoll instance.\n\n"); "MaxScale encountered system limit while "
"attempting to register on an epoll instance.");
return 0; return 0;
} }
#if defined(FAKE_CODE) #if defined(FAKE_CODE)