mirror of
https://github.com/tstack/lnav.git
synced 2024-09-11 13:05:51 +03:00
[vmw_log] fix full message read for continued messages
This commit is contained in:
parent
7664b75a87
commit
244ee2717f
@ -63,9 +63,9 @@ static struct {
|
|||||||
{ "hexd", pcrepp(
|
{ "hexd", pcrepp(
|
||||||
"\\A([0-9a-fA-F][0-9a-fA-F](?::[0-9a-fA-F][0-9a-fA-F])+)"), },
|
"\\A([0-9a-fA-F][0-9a-fA-F](?::[0-9a-fA-F][0-9a-fA-F])+)"), },
|
||||||
|
|
||||||
{ "coln", pcrepp("\\A(:)"),
|
{ "coln", pcrepp("\\A(:)"),
|
||||||
},
|
},
|
||||||
{ "eq", pcrepp("\\A(=)"),
|
{ "eq", pcrepp("\\A(=)"),
|
||||||
},
|
},
|
||||||
{ "comm", pcrepp("\\A(,)"),
|
{ "comm", pcrepp("\\A(,)"),
|
||||||
},
|
},
|
||||||
|
@ -669,13 +669,13 @@
|
|||||||
"url" : "http://kb.vmware.com/kb/2004201",
|
"url" : "http://kb.vmware.com/kb/2004201",
|
||||||
"regex" : {
|
"regex" : {
|
||||||
"6.0+" : {
|
"6.0+" : {
|
||||||
"pattern" : "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) (?:Section for VMware VirtualCenter,.*|(?<level>\\w+) (?<prc>\\w+)\\[(?<tid>\\w+)\\] \\[(?<src>[^ \\]]+)\\s*(?: sub=(?<sub>[^ \\]]+))?(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>(?:.|\\n)*))$"
|
"pattern" : "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) (?:Section for VMware VirtualCenter,.*|(?<level>\\w+) (?<prc>\\w+)\\[(?<tid>\\w+)\\] \\[(?<src>[^ \\]]+)\\s*(?: sub=(?<sub>[^ \\]]+))?(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>.*)(?:\\n(?:.|\\n)*)?)$"
|
||||||
},
|
},
|
||||||
"5.0+" : {
|
"5.0+" : {
|
||||||
"pattern" : "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) \\[(?<tid>\\w+) (?<level>\\w+) '(?<comp>[^']+)'(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>(?:.|\\n)*)$"
|
"pattern" : "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) \\[(?<tid>\\w+) (?<level>\\w+) '(?<comp>[^']+)'(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>.*)(?:\\n(?:.|\\n)*)?$"
|
||||||
},
|
},
|
||||||
"pre-5.0" : {
|
"pre-5.0" : {
|
||||||
"pattern" : "^\\[(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) (?<tid>\\w+) (?<level>\\w+) '(?<comp>[^']+)'(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>(?:.|\\n)*)$"
|
"pattern" : "^\\[(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{3}) (?<tid>\\w+) (?<level>\\w+) '(?<comp>[^']+)'(?: opID=(?<opid>[^ \\]]+))?(?: user=(?<user>[\\w\\-]+))?\\](?<body>.*)(?:\\n(?:.|\\n)*)?$"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"level-field": "level",
|
"level-field": "level",
|
||||||
@ -719,7 +719,7 @@
|
|||||||
"line" : "[2011-04-01 15:14:34.203 F5A5AB90 info 'vm:/vmfs/volumes/4d6579ec-23f981cb-465c-00237da0cfee/Vmotion-test/Vmotion-test.vmx' opID=F6FC49D5-000007E6-d] VMotionPrepare: dstMgmtIp=10.21.49.138"
|
"line" : "[2011-04-01 15:14:34.203 F5A5AB90 info 'vm:/vmfs/volumes/4d6579ec-23f981cb-465c-00237da0cfee/Vmotion-test/Vmotion-test.vmx' opID=F6FC49D5-000007E6-d] VMotionPrepare: dstMgmtIp=10.21.49.138"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"line" : "2014-11-04T15:53:31.075+05:30 verbose vpxd[05160] [Originator@6876 sub=PropertyProvider opID=ProcessAlarmFiring-427c3c55] RecordOp ASSIGN: declaredAlarmState[\"alarm-1.host-23\"], host-23. Applied change to temp map.\nfoo"
|
"line" : "2014-11-04T15:53:31.075+05:30 verbose vpxd[05160] [Originator@6876 sub=PropertyProvider opID=ProcessAlarmFiring-427c3c55] RecordOp ASSIGN: declaredAlarmState[\"alarm-1.host-23\"], host-23. Applied change to temp map."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"line" : "2014-01-17T04:55:50.347Z [7F03ECE76700 verbose 'Default' opID=2140bc71] [VpxVmomi] Invoke done: vmodl.query.PropertyCollector.waitForUpdatesEx session: c580b3ef-0011-88a5-b2af-7ca7e74114c8"
|
"line" : "2014-01-17T04:55:50.347Z [7F03ECE76700 verbose 'Default' opID=2140bc71] [VpxVmomi] Invoke done: vmodl.query.PropertyCollector.waitForUpdatesEx session: c580b3ef-0011-88a5-b2af-7ca7e74114c8"
|
||||||
|
@ -250,7 +250,9 @@ public:
|
|||||||
|
|
||||||
do {
|
do {
|
||||||
++next_line;
|
++next_line;
|
||||||
} while (next_line != this->end() && ll->get_offset() == next_line->get_offset());
|
} while ((next_line != this->end()) &&
|
||||||
|
((ll->get_offset() == next_line->get_offset()) ||
|
||||||
|
next_line->is_continued()));
|
||||||
|
|
||||||
if (next_line == this->end()) {
|
if (next_line == this->end()) {
|
||||||
retval = this->lf_index_size - ll->get_offset();
|
retval = this->lf_index_size - ll->get_offset();
|
||||||
|
Loading…
Reference in New Issue
Block a user