Skip to content

bug: fix ctl process manager initialization non-interactive #2189

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 31, 2022
+9 −1
Merged

bug: fix ctl process manager initialization non-interactive #2189

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ CHANGELOG
- CodeQL Github Actions `exponential backtracking on strings` fixed. (PR#2148 by Sebastian Waldbauer, fixes #2138)

### Tools
- `intelmqctl`: fix process manager initialization if run non-interactively, as intelmqdump does it (PR#2189 by Sebastian Wagner, fixes 2188).

### Contrib
- logrotate: Move compress and ownership rules to the IntelMQ-blocks to prevent that they apply to other files (PR#2111 by Sebastian Wagner, fixes #2110).
Expand Down
9 changes: 8 additions & 1 deletion intelmq/bin/intelmqctl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import textwrap
import traceback
import time
from collections import OrderedDict

import pkg_resources
from ruamel.yaml import YAML
Expand Down Expand Up @@ -374,6 +373,14 @@ def __init__(self, interactive: bool = False, returntype: ReturnType = ReturnTyp
parser_debug.set_defaults(func=self.debug)

self.parser = parser
else:
self._processmanager = process_managers()[self._processmanagertype](
self._interactive,
self._runtime_configuration,
self._logger,
self._returntype,
self._quiet
)

def load_defaults_configuration(self, silent=False):
for option, value in utils.get_global_settings().items():
Expand Down