Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-03 23:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[loader] prefer user-provided formats when breaking a cycle

Browse Source
This commit is contained in:
Timothy Stack 2015-10-11 20:51:22 -07:00
parent 97699e93a9
commit dfb009595b
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/log_format.hh
View File

@ -783,6 +783,7 @@ public:
elf_multiline(true),
elf_container(false),
elf_has_module_format(false),
elf_builtin_format(false),
jlf_json(false),
jlf_hide_extra(false),
jlf_cached_offset(-1),
@ -900,6 +901,7 @@ public:
bool elf_multiline;
bool elf_container;
bool elf_has_module_format;
bool elf_builtin_format;
enum json_log_field {
JLF_CONSTANT,

47
src/log_format_loader.cc
View File

@ -53,10 +53,16 @@ using namespace std;
static map<intern_string_t, external_log_format *> LOG_FORMATS;
struct userdata {
std::string ud_format_path;
vector<intern_string_t> *ud_format_names;
};
static external_log_format *ensure_format(yajlpp_parse_context *ypc)
{
const intern_string_t name = ypc->get_path_fragment_i(0);
vector<intern_string_t> *formats = (vector<intern_string_t> *)ypc->ypc_userdata;
struct userdata *ud = (userdata *) ypc->ypc_userdata;
vector<intern_string_t> *formats = ud->ud_format_names;
external_log_format *retval;
retval = LOG_FORMATS[name];
@ -70,6 +76,10 @@ static external_log_format *ensure_format(yajlpp_parse_context *ypc)
formats->push_back(name);
}
if (ud->ud_format_path.empty()) {
retval->elf_builtin_format = true;
}
return retval;
}
@ -458,11 +468,14 @@ static void write_sample_file(void)
std::vector<intern_string_t> load_format_file(const string &filename, std::vector<string> &errors)
{
std::vector<intern_string_t> retval;
struct userdata ud;
auto_fd fd;
log_info("loading formats from file: %s", filename.c_str());
ud.ud_format_path = filename;
ud.ud_format_names = &retval;
yajlpp_parse_context ypc(filename, format_handlers);
ypc.ypc_userdata = &retval;
ypc.ypc_userdata = &ud;
if ((fd = open(filename.c_str(), O_RDONLY)) == -1) {
char errmsg[1024];
@ -547,13 +560,15 @@ void load_formats(const std::vector<std::string> &extra_paths,
string default_source = string(dotlnav_path("formats") + "/default/");
yajlpp_parse_context ypc_builtin(default_source, format_handlers);
std::vector<intern_string_t> retval;
struct userdata ud;
yajl_handle handle;
write_sample_file();
log_debug("Loading default formats");
handle = yajl_alloc(&ypc_builtin.ypc_callbacks, NULL, &ypc_builtin);
ypc_builtin.ypc_userdata = &retval;
ud.ud_format_names = &retval;
ypc_builtin.ypc_userdata = &ud;
yajl_config(handle, yajl_allow_comments, 1);
if (yajl_parse(handle,
(const unsigned char *)default_log_formats_json,
@ -629,10 +644,28 @@ void load_formats(const std::vector<std::string> &extra_paths,
}
if (popped_formats.empty() && !alpha_ordered_formats.empty()) {
external_log_format *elf = alpha_ordered_formats.front();
log_warning("Detected a cycle, breaking by picking %s",
elf->get_name().get());
elf->elf_collision.clear();
bool broke_cycle = false;
log_warning("Detected a cycle...");
for (vector<external_log_format *>::iterator iter = alpha_ordered_formats.begin();
iter != alpha_ordered_formats.end();
++iter) {
external_log_format *elf = *iter;
if (elf->elf_builtin_format) {
log_warning(" Skipping builtin format -- %s",
elf->get_name().get());
} else {
log_warning(" Breaking cycle by picking -- %s",
elf->get_name().get());
elf->elf_collision.clear();
broke_cycle = true;
break;
}
}
if (!broke_cycle) {
alpha_ordered_formats.front()->elf_collision.clear();
}
}
for (vector<external_log_format *>::iterator iter = alpha_ordered_formats.begin();