-
Notifications
You must be signed in to change notification settings - Fork 75
Fix MSSQL log parser bug #1393
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
qmadev
wants to merge
8
commits into
fox-it:main
Choose a base branch
from
qmadev:fix/mssql-errorlog
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix MSSQL log parser bug #1393
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0be213e
Fix MSSQL log parsing bug
qmadev d7c611a
lint
qmadev f93f855
Fix comment
qmadev c28b294
Merge branch 'main' into fix/mssql-errorlog
qmadev 73346c8
Merge branch 'main' into fix/mssql-errorlog
qmadev 5d2442d
Process feedback
qmadev b46971e
Lint
qmadev 5bc9569
Add comment
qmadev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,19 +81,38 @@ def errorlog(self) -> Iterator[MssqlErrorlogRecord]: | |
| buf = "" | ||
|
|
||
| for line in fh: | ||
| if ts := RE_TIMESTAMP_PATTERN.match(line): | ||
| # If we have a buffer with a timestamp and | ||
| # our current line also has a timestamp, | ||
| # we should have a complete record in our buffer. | ||
| if previous_ts := RE_TIMESTAMP_PATTERN.match(buf): | ||
| if current_ts := RE_TIMESTAMP_PATTERN.match(line): | ||
| yield MssqlErrorlogRecord( | ||
| ts=datetime.strptime(previous_ts.group(), "%Y-%m-%d %H:%M:%S.%f").replace(tzinfo=timezone.utc), | ||
| instance=instance, | ||
| # The process name is a fixed-width field and is always 12 characters long. | ||
| process=buf[23:35].strip(), | ||
| message=buf[35:].strip(), | ||
| path=errorlog, | ||
| _target=self.target, | ||
| ) | ||
|
|
||
| buf = "" | ||
|
|
||
| buf += line | ||
|
|
||
| # For the last line | ||
| if buf: | ||
| if current_ts := RE_TIMESTAMP_PATTERN.match(line): | ||
|
||
| yield MssqlErrorlogRecord( | ||
| ts=datetime.strptime(ts.group(), "%Y-%m-%d %H:%M:%S.%f").replace(tzinfo=timezone.utc), | ||
| ts=datetime.strptime(current_ts.group(), "%Y-%m-%d %H:%M:%S.%f").replace(tzinfo=timezone.utc), | ||
| instance=instance, | ||
| # The process name is a fixed-width field and is always 12 characters long. | ||
| process=buf[23:35].strip(), | ||
| message=buf[35:].strip(), | ||
| path=errorlog, | ||
| _target=self.target, | ||
| ) | ||
| buf = "" | ||
|
|
||
| buf += line | ||
|
|
||
| def _find_instances(self) -> set[str, TargetPath]: | ||
| return { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This potentially causes memory exhaustion if the log file does not start with a timestamp.
(And no entries will get returned)
I think the logic I posted here does not suffer from that problem