Improve ApachePlugin log file discovery #980
Open
+282
−59
Conversation
This file contains 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
|
|
||
| directive = match.groupdict() | ||
|
|
||
| if "*" in directive["location"]: |
There was a problem hiding this comment.
Why do not use glob directly?
As python glob rely on fnmatch and apache documentation explicitly mark the location as being fnmatch style (https://httpd.apache.org/docs/2.4/en/mod/core.html#include)
Shell-style (fnmatch()) wildcard characters can be used in the filename`
| match = pattern_to_use.match(line) | ||
| if not match: | ||
| self.target.log.warning("Unexpected Apache log configuration: %s (%s)", line, path) | ||
| def _process_conf_file(self, path: Path) -> None: |
There was a problem hiding this comment.
Maybe it's would be better to add either a max_recurse integer or to create a set of already processed file in order to prevent infinite recursion?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR improves the log file discovery of the ApachePlugin on targets.
IncludeandIncludeOptionaldirectives in all apache.conffiles (mods, sites and confs) and extractErrorLogandCustomLogfrom those configuration files.envvarsfrom those log file location directives (e.g.${APACHE_LOG_DIR}).