thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

addressed minor change requests

Browse Source
This commit is contained in:
root 2022-08-28 19:02:14 -07:00 committed by Mallik Hassan
parent 84a617675d
commit f02f7ce99c
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Loggers/OwnJSONPatternFormatter.cpp
View File

@ -32,13 +32,13 @@ OwnJSONPatternFormatter::OwnJSONPatternFormatter(Poco::Util::AbstractConfigurati
message = config.getString("logger.formatting.names.message", "");
if (config.has("logger.formatting.names.source_file"))
source_file_ = config.getString("logger.formatting.names.source_file", "");
source_file = config.getString("logger.formatting.names.source_file", "");
if (config.has("logger.formatting.names.source_line"))
source_line = config.getString("logger.formatting.names.source_line", "");
if (date_time.empty() && thread_name.empty() && thread_id.empty() && level.empty() && query_id.empty()
&& logger_name.empty() && message.empty() && source_file_.empty() && source_line.empty())
&& logger_name.empty() && message.empty() && source_file.empty() && source_line.empty())
{
date_time = "date_time";
thread_name = "thread_name";
@ -47,7 +47,7 @@ OwnJSONPatternFormatter::OwnJSONPatternFormatter(Poco::Util::AbstractConfigurati
query_id = "query_id";
logger_name = "logger_name";
message = "message";
source_file_ = "source_file";
source_file = "source_file";
source_line = "source_line";
}
}
@ -161,18 +161,18 @@ void OwnJSONPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_
writeJSONString(msg.getText(), wb, settings);
}
if (!source_file_.empty())
if (!source_file.empty())
{
if (print_comma)
DB::writeChar(',', wb);
else
print_comma = true;
writeJSONString(source_file_, wb, settings);
writeJSONString(source_file, wb, settings);
DB::writeChar(':', wb);
const char * source_file = msg.getSourceFile();
if (source_file != nullptr)
writeJSONString(source_file, wb, settings);
const char * source_file_name = msg.getSourceFile();
if (source_file_name != nullptr)
writeJSONString(source_file_name, wb, settings);
else
writeJSONString("", wb, settings);
}

2
src/Loggers/OwnJSONPatternFormatter.h
View File

@ -39,6 +39,6 @@ private:
std::string query_id;
std::string logger_name;
std::string message;
std::string source_file_;
std::string source_file;
std::string source_line;
};

8
tests/integration/test_structured_logging_json/test.py
View File

@ -94,8 +94,6 @@ def test_structured_logging_json_format(start_cluster):
["cat", "/etc/clickhouse-server/config.d/config_no_keys_json.xml"]
)
assert (
valiade_everything(config_all_keys, node_all_keys, "config_all_keys")
and valiade_everything(config_some_keys, node_some_keys, "config_some_keys")
and valiade_everything(config_no_keys, node_no_keys, "config_no_keys")
)
assert valiade_everything(config_all_keys, node_all_keys, "config_all_keys") == True
assert valiade_everything(config_some_keys, node_some_keys, "config_some_keys") == True
assert valiade_everything(config_no_keys, node_no_keys, "config_no_keys") == True