Skip to content

webui: improve log message keyword highlighting#937

Merged
pstorz merged 2 commits intomasterfrom
dev/fbergkemper/master/s4942
Oct 7, 2021
Merged

webui: improve log message keyword highlighting#937
pstorz merged 2 commits intomasterfrom
dev/fbergkemper/master/s4942

Conversation

@frb121
Copy link
Contributor

@frb121 frb121 commented Sep 27, 2021

Highlight the additional keywords "Cannot" and "ERR" in Log messages.

Thank you for contributing to the Bareos Project!

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

General
  • PR name is meaningful
  • Purpose of the PR is understood
  • Separate commit for this PR in the CHANGELOG.md, PR number referenced is same
  • Commit descriptions are understandable and well formatted
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR
  • bareos-check-sources --since-merge does not report any problems
  • git status should not report modifications in the source tree after building and testing

@frb121 frb121 self-assigned this Sep 27, 2021
@frb121 frb121 requested a review from pstorz September 27, 2021 15:45
@frb121 frb121 marked this pull request as draft September 28, 2021 12:02
@frb121 frb121 added the nobuild label Sep 28, 2021
@frb121 frb121 force-pushed the dev/fbergkemper/master/s4942 branch from 6a6e886 to 5fa7ec5 Compare October 1, 2021 14:11
@frb121 frb121 marked this pull request as ready for review October 1, 2021 14:25
@frb121 frb121 removed the nobuild label Oct 1, 2021
Copy link
Member

@pstorz pstorz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The danger_keywords now are also matched without word borders, whch means that
override is marked as ovride. It would be great if the keywords would be matched
with word borders.

frb121 added 2 commits October 6, 2021 18:14
Highlight the additional keywords "Cannot" and "ERR" in Log messages.
@frb121 frb121 force-pushed the dev/fbergkemper/master/s4942 branch from db157f3 to 7d0da52 Compare October 6, 2021 16:16
@frb121
Copy link
Contributor Author

frb121 commented Oct 6, 2021

Word boundaries added.

@pstorz pstorz merged commit 1e52b82 into master Oct 7, 2021
@pstorz pstorz deleted the dev/fbergkemper/master/s4942 branch October 7, 2021 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants