Skip to content
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

Adapt binary to wazuh-cluster daemon rename #3944

Merged
merged 3 commits into from
Feb 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Release report: TBD

### Added

- Adapt binary performance module to wazuh-cluster script renaming ([#3944](https://github.com/wazuh/wazuh-qa/pull/3944)) \- (Framework)
- Add an option to store logs in system tests ([#2445](https://github.com/wazuh/wazuh-qa/pull/2445)) \- (Framework + Tests)
- Add new test to check cpe_helper.json file ([#3731](https://github.com/wazuh/wazuh-qa/pull/3731))
- Add new tests analysid handling of invalid/empty rule signature IDs ([#3649]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def get_process_pids(cls, process_name, check_children=True) -> list:
# These two binaries are executed using the Python interpreter instead of
# directly execute them as daemons. That's why we need to search the .py file in
# the cmdline instead of searching it in the name
if process_name in ['wazuh-clusterd', 'wazuh-apid']:
if process_name in ['wazuh_clusterd', 'wazuh-apid']:
if any(filter(lambda x: f'{process_name}.py' in x, proc.cmdline())):
pid = proc.pid
break
Expand Down
3 changes: 2 additions & 1 deletion deps/wazuh_testing/wazuh_testing/tools/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ def control_service(action, daemon=None, debug_mode=False):
delete_sockets(WAZUH_SOCKETS[daemon])
else:
daemon_path = os.path.join(WAZUH_PATH, 'bin')
subprocess.check_call([f'{daemon_path}/{daemon}', '' if not debug_mode else '-dd'])
start_process = [f'{daemon_path}/{daemon}'] if not debug_mode else [f'{daemon_path}/{daemon}', '-dd']
subprocess.check_call(start_process)
result = 0

if result != 0:
Expand Down