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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-03-06 17:02:03 +02:00
parent 8232c5d449 78abfd67e6
commit d6b8147119
13 changed files with 256 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/messagequeue.cc
View File

@ -176,6 +176,11 @@ bool MessageQueue::post(const Message& message) const
{
ssize_t n = write(m_write_fd, &message, sizeof(message));
rv = (n == sizeof(message));
if (n == -1)
{
MXS_ERROR("Failed to write message: %d, %s", errno, mxs_strerror(errno));
}
}
else
{

10
server/core/service.cc
View File

@ -624,11 +624,21 @@ int service_launch_all()
SERVICE *ptr;
int n = 0, i;
bool error = false;
int num_svc = 0;
for (ptr = allServices; ptr; ptr = ptr->next)
{
num_svc++;
}
MXS_NOTICE("Starting a total of %d services...", num_svc);
int curr_svc = 1;
ptr = allServices;
while (ptr && !ptr->svc_do_shutdown)
{
n += (i = serviceInitialize(ptr));
MXS_NOTICE("Service '%s' started (%d/%d)", ptr->name, curr_svc++, num_svc);
if (i == 0)
{