Skip to content

pw_poller: use configured trees for subject tag match #49

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 7, 2025
Merged

pw_poller: use configured trees for subject tag match #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions netdev/tree_match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from core import log, log_open_sec, log_end_sec


def series_tree_name_direct(series):
for t in ['net-next', 'bpf-next', 'net', 'bpf']:
def series_tree_name_direct(conf_trees, series):
for t in conf_trees:
if re.match(r'\[.*{pfx}.*\]'.format(pfx=t), series.subject):
return t

Expand Down
2 changes: 1 addition & 1 deletion pw_poller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def init_state_from_disk(self) -> None:
pass

def _series_determine_tree(self, s: PwSeries) -> str:
s.tree_name = self.list_module.series_tree_name_direct(s)
s.tree_name = self.list_module.series_tree_name_direct(self._trees.keys(), s)
s.tree_mark_expected = True
s.tree_marked = bool(s.tree_name)

Expand Down