Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

regex fix to kill py2 hrw process #889

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

regex fix to kill py2 hrw process #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c8fa75
regex fix to kill py2 hrw process
dmohanta Oct 28, 2022
45dc5aa
Merge branch 'master' into python2_fix
nikhim-um Jan 17, 2023
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
2 changes: 1 addition & 1 deletion Providers/Scripts/2.4x-2.5x/Scripts/nxOMSAutomationWorker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ def kill_worker_manager(workspace_id):
Exceptions:
throws exception if process was running and could not be killed
"""
pattern_match_string = "python\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id)
pattern_match_string = "python2\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id)

retval = kill_process_by_pattern_string(pattern_match_string)
# can't depend on the return value to ensure that the process was killed since it pattern matches
Expand Down
2 changes: 1 addition & 1 deletion Providers/Scripts/2.6x-2.7x/Scripts/nxOMSAutomationWorker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ def kill_worker_manager(workspace_id):
Exceptions:
throws exception if process was running and could not be killed
"""
pattern_match_string = "python\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id)
pattern_match_string = "python2\s.*main\.py.*%s%s\s" % (WORKSPACE_ID_PREFIX, workspace_id)

retval = kill_process_by_pattern_string(pattern_match_string)
# can't depend on the return value to ensure that the process was killed since it pattern matches
Expand Down
2 changes: 1 addition & 1 deletion Providers/nxOMSAutomationWorker/automationworker/3.x/worker/configuration3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
DEFAULT_VM_ID = DEFAULT_UNKNOWN
DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
DEFAULT_COMPONENT = DEFAULT_UNKNOWN
DEFAULT_WORKER_VERSION = "1.10.0.0"
DEFAULT_WORKER_VERSION = "1.10.1.0"
DEFAULT_JRDS_POLLING_FREQUENCY = "30"

# state configuration keys
Expand Down
2 changes: 1 addition & 1 deletion Providers/nxOMSAutomationWorker/automationworker/worker/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
DEFAULT_VM_ID = DEFAULT_UNKNOWN
DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
DEFAULT_COMPONENT = DEFAULT_UNKNOWN
DEFAULT_WORKER_VERSION = "1.10.0.0"
DEFAULT_WORKER_VERSION = "1.10.1.0"
DEFAULT_JRDS_POLLING_FREQUENCY = "30"

# state configuration keys
Expand Down
2 changes: 1 addition & 1 deletion Providers/nxOMSAutomationWorker/automationworker/worker/configuration2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DEFAULT_VM_ID = DEFAULT_UNKNOWN
DEFAULT_WORKER_TYPE = DEFAULT_UNKNOWN
DEFAULT_COMPONENT = DEFAULT_UNKNOWN
DEFAULT_WORKER_VERSION = "1.10.0.0"
DEFAULT_WORKER_VERSION = "1.10.1.0"
DEFAULT_JRDS_POLLING_FREQUENCY = "30"

# state configuration keys
Expand Down