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

log_manager.h

Browse Source 
Added macros which allow for testing locally if log is enabled or not.

server/Makefile
	Added directory creation command to Makefile. This fixes problem where errmsg.sys was copied to MaxScale/mysql instead of MaxScale/mysql/errmsg.sys

dcb.b
	Added external variable which carries the information of enabled logs from log_manager.cc

gateway.c
	Tuned logging.
This commit is contained in:
vraatikka
2013-12-12 07:05:38 +02:00
parent 06ebc6f4b5
commit 272ca036e4
4 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
log_manager/log_manager.h
View File

@ -35,6 +35,18 @@ typedef enum {
typedef enum { FILEWRITER_INIT, FILEWRITER_RUN, FILEWRITER_DONE } typedef enum { FILEWRITER_INIT, FILEWRITER_RUN, FILEWRITER_DONE }
filewriter_state_t; filewriter_state_t;
#define LE LOGFILE_ERROR
#define LM LOGFILE_MESSAGE
#define LT LOGFILE_TRACE
#define LD LOGFILE_DEBUG
#define LOGIF(id,cmd) if (lm_enabled_logfiles_bitmask & id) \
{ \
cmd; \
} \
#define LOG_IS_ENABLED(id) ((lm_enabled_logfiles_bitmask & id) ? true : false)
/** /**
* UNINIT means zeroed memory buffer allocated for the struct. * UNINIT means zeroed memory buffer allocated for the struct.
* INIT means that struct members may have values, and memory may * INIT means that struct members may have values, and memory may

1
server/Makefile
View File

@ -53,6 +53,7 @@ install:
@mkdir -p $(DEST)/MaxScale/modules @mkdir -p $(DEST)/MaxScale/modules
@mkdir -p $(DEST)/MaxScale/log @mkdir -p $(DEST)/MaxScale/log
@mkdir -p $(DEST)/MaxScale/etc @mkdir -p $(DEST)/MaxScale/etc
@mkdir -p $(DEST)/MaxScale/mysql
@mkdir -p $(DEST)/lib @mkdir -p $(DEST)/lib
@mkdir -p $(DEST)/Documentation @mkdir -p $(DEST)/Documentation
install -b MaxScale_template.cnf $(DEST)/MaxScale/etc install -b MaxScale_template.cnf $(DEST)/MaxScale/etc

14
server/core/dcb.c
View File

@ -68,6 +68,8 @@
#include <skygw_utils.h> #include <skygw_utils.h>
#include <log_manager.h> #include <log_manager.h>
extern int lm_enabled_logfiles_bitmask;
static DCB *allDCBs = NULL; /* Diagnotics need a list of DCBs */ static DCB *allDCBs = NULL; /* Diagnotics need a list of DCBs */
static DCB *zombies = NULL; static DCB *zombies = NULL;
static SPINLOCK dcbspin = SPINLOCK_INIT; static SPINLOCK dcbspin = SPINLOCK_INIT;
@ -678,6 +680,17 @@ dcb_write(DCB *dcb, GWBUF *queue)
*/ */
dcb->writeq = gwbuf_append(dcb->writeq, queue); dcb->writeq = gwbuf_append(dcb->writeq, queue);
dcb->stats.n_buffered++; dcb->stats.n_buffered++;
#if 1
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_write] Append to writequeue. %d writes "
"buffered for dcb %p in state %s fd %d",
pthread_self(),
dcb->stats.n_buffered,
dcb,
STRDCBSTATE(dcb->state),
dcb->fd)));
#else
skygw_log_write( skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,
"%lu [dcb_write] Append to writequeue. %d writes " "%lu [dcb_write] Append to writequeue. %d writes "
@ -687,6 +700,7 @@ dcb_write(DCB *dcb, GWBUF *queue)
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd); dcb->fd);
#endif
} }
else else
{ {

6
server/core/gateway.c
View File

@ -1241,15 +1241,15 @@ int main(int argc, char **argv)
fprintf(stderr, fprintf(stderr,
"*\n* Error : MySQL Error should " "*\n* Error : MySQL Error should "
"be \"Unknown MySQL error\" " "be \"Unknown MySQL error\" "
"instead of %s\n* Hint " "instead of\n* %s\n* Hint "
":\n* Ensure that you have " ":\n* Ensure that you have "
"MySQL error messages file, errmsg.sys in " "MySQL error messages file, errmsg.sys in "
"\n* %s\n* Ensure that Embedded " "\n* %s/mysql\n* Ensure that Embedded "
"Server Library version matches " "Server Library version matches "
"exactly with that of the errmsg.sys " "exactly with that of the errmsg.sys "
"file.\n*\n", "file.\n*\n",
mysql_error(NULL), mysql_error(NULL),
language_arg); home_dir);
} }
else else
{ {