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

Rename some log concepts

Browse Source 
The mxs prefix is now uniformly used with all log components.
This commit is contained in:
Johan Wikman
2015-11-26 14:52:10 +02:00
parent 6ab9b4ca67
commit 916ee5ff2a
14 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/dcb.c
View File

@ -619,8 +619,8 @@ dcb_process_victim_queue(DCB *listofdcb)
}
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
dcb->state = DCB_STATE_DISCONNECTED;
nextdcb = dcb->memdata.next;
@ -629,7 +629,7 @@ dcb_process_victim_queue(DCB *listofdcb)
dcb = nextdcb;
}
/** Reset threads session data */
tls_log_info.li_sesid = 0;
mxs_log_tls.li_sesid = 0;
}
/**

6
server/core/gateway.c
View File

@ -1032,7 +1032,7 @@ int main(int argc, char **argv)
char* tmp_path;
char* tmp_var;
int option_index;
log_target_t log_target = LOG_TARGET_FS;
mxs_log_target_t log_target = MXS_LOG_TARGET_FS;
int *syslog_enabled = &config_get_global_options()->syslog; /** Log to syslog */
int *maxscalelog_enabled = &config_get_global_options()->maxlog; /** Log with MaxScale */
ssize_t log_flush_timeout_ms = 0;
@ -1121,9 +1121,9 @@ int main(int argc, char **argv)
case 'l':
if (strncasecmp(optarg, "file", PATH_MAX) == 0)
log_target = LOG_TARGET_FS;
log_target = MXS_LOG_TARGET_FS;
else if (strncasecmp(optarg, "shm", PATH_MAX) == 0)
log_target = LOG_TARGET_SHMEM;
log_target = MXS_LOG_TARGET_SHMEM;
else
{
char* logerr = "Configuration file argument "

2
server/core/maxkeys.c
View File

@ -48,7 +48,7 @@ int main(int argc, char **argv)
keyfile = argv[1];
}
mxs_log_init(NULL, NULL, LOG_TARGET_DEFAULT);
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_DEFAULT);
if (secrets_writeKeys(keyfile))
{

2
server/core/maxpasswd.c
View File

@ -51,7 +51,7 @@ main(int argc, char **argv)
return 1;
}
mxs_log_init(NULL, NULL, LOG_TARGET_DEFAULT);
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_DEFAULT);
pw = calloc(81, sizeof(char));

26
server/core/poll.c
View File

@ -859,8 +859,8 @@ unsigned long qtime;
atomic_add(&pollStats.n_write, 1);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "write_ready"))
{
@ -889,8 +889,8 @@ unsigned long qtime;
atomic_add(
&pollStats.n_accept, 1);
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "accept"))
{
@ -907,8 +907,8 @@ unsigned long qtime;
atomic_add(&pollStats.n_read, 1);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "read"))
{
@ -943,8 +943,8 @@ unsigned long qtime;
atomic_add(&pollStats.n_error, 1);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "error"))
{
@ -973,8 +973,8 @@ unsigned long qtime;
spinlock_release(&dcb->dcb_initlock);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "hangup EPOLLHUP"))
{
@ -1007,8 +1007,8 @@ unsigned long qtime;
spinlock_release(&dcb->dcb_initlock);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&tls_log_info.li_sesid,
&tls_log_info.li_enabled_priorities);
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "hangup EPOLLRDHUP"))
{
@ -1075,7 +1075,7 @@ unsigned long qtime;
}
dcb->evq.processing = 0;
/** Reset session id from thread's local storage */
tls_log_info.li_sesid = 0;
mxs_log_tls.li_sesid = 0;
spinlock_release(&pollqlock);
return 1;

4
server/core/session.c
View File

@ -271,7 +271,7 @@ session_set_dummy(DCB *client_dcb)
void session_enable_log_priority(SESSION* ses, int priority)
{
ses->enabled_log_priorities |= (1 << priority);
atomic_add((int *)&log_ses_count[priority], 1);
atomic_add((int *)&mxs_log_session_count[priority], 1);
}
/**
@ -287,7 +287,7 @@ void session_disable_log_priority(SESSION* ses, int priority)
if (ses->enabled_log_priorities & (1 << priority))
{
ses->enabled_log_priorities &= ~(1 << priority);
atomic_add((int *)&log_ses_count[priority], -1);
atomic_add((int *)&mxs_log_session_count[priority], -1);
}
}