MaxScale log called consistently for maxlog
There were some variance regarding the way the MaxScale log (i.e. the file log) was called; "maxlog" in configuration file and "maxscalelog" at the command line and maxadmin interface. Now it is uniformly referred to as "maxlog" in the configuration file, at the command line, from maxadmin and in the code.
This commit is contained in:
Johan Wikman
parent
2feb2ed3a2
commit
384029c109
@ -105,14 +105,14 @@ static struct
|
||||
int augmentation; // Can change during the lifetime of log_manager.
|
||||
bool do_highprecision; // Can change during the lifetime of log_manager.
|
||||
bool do_syslog; // Can change during the lifetime of log_manager.
|
||||
bool do_maxscalelog; // Can change during the lifetime of log_manager.
|
||||
bool do_maxlog; // Can change during the lifetime of log_manager.
|
||||
bool use_stdout; // Can NOT changed during the lifetime of log_manager.
|
||||
} log_config =
|
||||
{
|
||||
DEFAULT_LOG_AUGMENTATION, // augmentation
|
||||
false, // do_highprecision
|
||||
true, // do_syslog
|
||||
true, // do_maxscalelog
|
||||
true, // do_maxlog
|
||||
false // use_stdout
|
||||
};
|
||||
|
||||
@ -609,7 +609,7 @@ static int logmanager_write_log(int priority,
|
||||
// log_config may change during the course of the function, with would have
|
||||
// unpleasant side-effects.
|
||||
int do_highprecision = log_config.do_highprecision;
|
||||
int do_maxscalelog = log_config.do_maxscalelog;
|
||||
int do_maxlog = log_config.do_maxlog;
|
||||
int do_syslog = log_config.do_syslog;
|
||||
|
||||
assert(str);
|
||||
@ -689,7 +689,7 @@ static int logmanager_write_log(int priority,
|
||||
}
|
||||
#endif
|
||||
/** Book space for log string from buffer */
|
||||
if (do_maxscalelog)
|
||||
if (do_maxlog)
|
||||
{
|
||||
// All messages are now logged to the error log file.
|
||||
wp = blockbuf_get_writepos(&bb, safe_str_len, flush);
|
||||
@ -775,7 +775,7 @@ static int logmanager_write_log(int priority,
|
||||
}
|
||||
wp[safe_str_len - 1] = '\n';
|
||||
|
||||
if (do_maxscalelog)
|
||||
if (do_maxlog)
|
||||
{
|
||||
blockbuf_unregister(bb);
|
||||
}
|
||||
@ -2161,7 +2161,7 @@ static bool thr_flush_file(logmanager_t *lm, filewriter_t *fwr)
|
||||
err,
|
||||
strerror_r(err, errbuf, sizeof(errbuf)));
|
||||
|
||||
mxs_log_set_maxscalelog_enabled(false);
|
||||
mxs_log_set_maxlog_enabled(false);
|
||||
}
|
||||
/**
|
||||
* Reset buffer's counters and mark
|
||||
@ -2443,11 +2443,11 @@ void mxs_log_set_syslog_enabled(bool enabled)
|
||||
*
|
||||
* @param enabled True, if syslog logging should be enabled, false if it should be disabled.
|
||||
*/
|
||||
void mxs_log_set_maxscalelog_enabled(bool enabled)
|
||||
void mxs_log_set_maxlog_enabled(bool enabled)
|
||||
{
|
||||
log_config.do_maxscalelog = enabled;
|
||||
log_config.do_maxlog = enabled;
|
||||
|
||||
MXS_NOTICE("maxscalelog logging is %s.", enabled ? "enabled" : "disabled");
|
||||
MXS_NOTICE("maxlog logging is %s.", enabled ? "enabled" : "disabled");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ int mxs_log_rotate();
|
||||
|
||||
int mxs_log_set_priority_enabled(int priority, bool enabled);
|
||||
void mxs_log_set_syslog_enabled(bool enabled);
|
||||
void mxs_log_set_maxscalelog_enabled(bool enabled);
|
||||
void mxs_log_set_maxlog_enabled(bool enabled);
|
||||
void mxs_log_set_highprecision_enabled(bool enabled);
|
||||
void mxs_log_set_augmentation(int bits);
|
||||
|
||||
|
||||
@ -166,7 +166,7 @@ static struct option long_options[] = {
|
||||
{"cachedir", required_argument, 0, 'A'},
|
||||
{"language", required_argument, 0, 'N'},
|
||||
{"syslog", required_argument, 0, 's'},
|
||||
{"maxscalelog", required_argument, 0, 'S'},
|
||||
{"maxlog", required_argument, 0, 'S'},
|
||||
{"user", required_argument, 0, 'U'},
|
||||
{"version", no_argument, 0, 'v'},
|
||||
{"help", no_argument, 0, '?'},
|
||||
@ -970,7 +970,7 @@ static void usage(void)
|
||||
" -U, --user=USER run MaxScale as another user.\n"
|
||||
" The user ID and group ID of this user are used to run MaxScale.\n"
|
||||
" -s, --syslog=[yes|no] log messages to syslog (default:yes)\n"
|
||||
" -S, --maxscalelog=[yes|no] log messages to MaxScale log (default: yes)\n"
|
||||
" -S, --maxlog=[yes|no] log messages to MaxScale log (default: yes)\n"
|
||||
" -v, --version print version info and exit\n"
|
||||
" -V, --version-full print full version info and exit\n"
|
||||
" -?, --help show this help\n"
|
||||
@ -1034,7 +1034,7 @@ int main(int argc, char **argv)
|
||||
int option_index;
|
||||
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 */
|
||||
int *maxlog_enabled = &config_get_global_options()->maxlog; /** Log with MaxScale */
|
||||
ssize_t log_flush_timeout_ms = 0;
|
||||
sigset_t sigset;
|
||||
sigset_t sigpipe_mask;
|
||||
@ -1042,7 +1042,7 @@ int main(int argc, char **argv)
|
||||
void (*exitfunp[4])(void) = { mxs_log_finish, datadir_cleanup, write_footer, NULL };
|
||||
|
||||
*syslog_enabled = 1;
|
||||
*maxscalelog_enabled = 1;
|
||||
*maxlog_enabled = 1;
|
||||
|
||||
sigemptyset(&sigpipe_mask);
|
||||
sigaddset(&sigpipe_mask, SIGPIPE);
|
||||
@ -1210,11 +1210,11 @@ int main(int argc, char **argv)
|
||||
{
|
||||
tok++;
|
||||
if (tok)
|
||||
*maxscalelog_enabled = config_truth_value(tok);
|
||||
*maxlog_enabled = config_truth_value(tok);
|
||||
}
|
||||
else
|
||||
{
|
||||
*maxscalelog_enabled = config_truth_value(optarg);
|
||||
*maxlog_enabled = config_truth_value(optarg);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@ -1666,13 +1666,13 @@ int main(int argc, char **argv)
|
||||
printf("Syslog logging is disabled.\n");
|
||||
}
|
||||
|
||||
if (!(*maxscalelog_enabled))
|
||||
if (!(*maxlog_enabled))
|
||||
{
|
||||
printf("MaxScale logging is disabled.\n");
|
||||
}
|
||||
|
||||
mxs_log_set_syslog_enabled(*syslog_enabled);
|
||||
mxs_log_set_maxscalelog_enabled(*maxscalelog_enabled);
|
||||
mxs_log_set_maxlog_enabled(*maxlog_enabled);
|
||||
|
||||
succp = mxs_log_init(NULL, get_logdir(), log_target);
|
||||
|
||||
|
||||
@ -429,8 +429,8 @@ static void enable_feedback_action();
|
||||
static void disable_feedback_action();
|
||||
static void enable_syslog();
|
||||
static void disable_syslog();
|
||||
static void enable_maxscalelog();
|
||||
static void disable_maxscalelog();
|
||||
static void enable_maxlog();
|
||||
static void disable_maxlog();
|
||||
|
||||
/**
|
||||
* * The subcommands of the enable command
|
||||
@ -511,11 +511,11 @@ struct subcommand enableoptions[] = {
|
||||
{0, 0, 0}
|
||||
},
|
||||
{
|
||||
"maxscalelog",
|
||||
"maxlog",
|
||||
0,
|
||||
enable_maxscalelog,
|
||||
"Enable maxscalelog logging",
|
||||
"Enable maxscalelog logging",
|
||||
enable_maxlog,
|
||||
"Enable maxlog logging",
|
||||
"Enable maxlog logging",
|
||||
{0, 0, 0}
|
||||
},
|
||||
{
|
||||
@ -609,11 +609,11 @@ struct subcommand disableoptions[] = {
|
||||
{0, 0, 0}
|
||||
},
|
||||
{
|
||||
"maxscalelog",
|
||||
"maxlog",
|
||||
0,
|
||||
disable_maxscalelog,
|
||||
"Disable maxscalelog logging",
|
||||
"Disable maxscalelog logging",
|
||||
disable_maxlog,
|
||||
"Disable maxlog logging",
|
||||
"Disable maxlog logging",
|
||||
{0, 0, 0}
|
||||
},
|
||||
{
|
||||
@ -1803,21 +1803,21 @@ disable_syslog()
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable maxscalelog logging.
|
||||
* Enable maxlog logging.
|
||||
*/
|
||||
static void
|
||||
enable_maxscalelog()
|
||||
enable_maxlog()
|
||||
{
|
||||
mxs_log_set_maxscalelog_enabled(true);
|
||||
mxs_log_set_maxlog_enabled(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable maxscalelog logging.
|
||||
* Disable maxlog logging.
|
||||
*/
|
||||
static void
|
||||
disable_maxscalelog()
|
||||
disable_maxlog()
|
||||
{
|
||||
mxs_log_set_maxscalelog_enabled(false);
|
||||
mxs_log_set_maxlog_enabled(false);
|
||||
}
|
||||
|
||||
#if defined(FAKE_CODE)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user