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

MXS-1300: Add enabled log priorities to /maxscale/logs resurce

Browse Source 
The logging priorities should be displayed as a part of the resource as
they can be enabled or disabled at runtime.
This commit is contained in:
Markus Mäkelä
2017-07-21 17:39:57 +03:00
parent f28a919982
commit 84dc0b2d37
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxctrl/lib/show.js
View File

@ -112,6 +112,7 @@ exports.builder = function(yargs) {
maxctrl(argv, function(host) { maxctrl(argv, function(host) {
return getResource(host, 'maxscale/logs', [ return getResource(host, 'maxscale/logs', [
{'Current Log File': 'attributes.log_file'}, {'Current Log File': 'attributes.log_file'},
{'Enabled Log Levels': 'attributes.log_priorities'},
{'Parameters': 'attributes.parameters'} {'Parameters': 'attributes.parameters'}
]) ])
}) })

33
server/core/log_manager.cc
View File

@ -3017,6 +3017,38 @@ const char* mxs_strerror(int error)
return strerror_r(error, errbuf, sizeof(errbuf)); return strerror_r(error, errbuf, sizeof(errbuf));
} }
json_t* get_log_priorities()
{
json_t* arr = json_array();
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_ERR))
{
json_array_append_new(arr, json_string("error"));
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_WARNING))
{
json_array_append_new(arr, json_string("warning"));
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_NOTICE))
{
json_array_append_new(arr, json_string("notice"));
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_INFO))
{
json_array_append_new(arr, json_string("info"));
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_DEBUG))
{
json_array_append_new(arr, json_string("debug"));
}
return arr;
}
json_t* mxs_logs_to_json(const char* host) json_t* mxs_logs_to_json(const char* host)
{ {
json_t* param = json_object(); json_t* param = json_object();
@ -3038,6 +3070,7 @@ json_t* mxs_logs_to_json(const char* host)
json_t* attr = json_object(); json_t* attr = json_object();
json_object_set_new(attr, CN_PARAMETERS, param); json_object_set_new(attr, CN_PARAMETERS, param);
json_object_set_new(attr, "log_file", json_string(lm->lm_filewriter.fwr_file->sf_fname)); json_object_set_new(attr, "log_file", json_string(lm->lm_filewriter.fwr_file->sf_fname));
json_object_set_new(attr, "log_priorities", get_log_priorities());
json_t* data = json_object(); json_t* data = json_object();
json_object_set_new(data, CN_ATTRIBUTES, attr); json_object_set_new(data, CN_ATTRIBUTES, attr);