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

Fixed case where comparing stdout bytes to a string issue 797 #798

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed case where comparing stdout bytes to a string issue 797 #798

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
23 changes: 15 additions & 8 deletions Providers/Scripts/3.x/Scripts/nxService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,8 @@ def GetSystemdState(sc):
(process_stdout, process_stderr, retval) = Process(
[systemctl_path, "status", sc.Name])
if retval is 0:
if '(running)' in process_stdout:
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if '(running)' in process_stdout_str:
return "running"
return "stopped"

Expand Down Expand Up @@ -602,7 +603,8 @@ def GetUpstartState(sc):
" failed: " + process_stderr)
return ""

if (sc.Name + " start") in process_stdout:
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if (sc.Name + " start") in process_stdout_str:
return "running"
else:
return "stopped"
Expand Down Expand Up @@ -678,7 +680,8 @@ def GetUpstartEnabled(sc):
(process_stdout, process_stderr, retval) = Process(
['chkconfig', sc.Name, '']) # try init style
if retval is 0:
if 'off' not in process_stdout:
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if 'off' not in process_stdout_str:
return True
return False
if start_on_exists and start_on_is_enabled:
Expand Down Expand Up @@ -855,7 +858,8 @@ def ServiceExistsInSystemd(sc):
(process_stdout, process_stderr, retval) = Process(
[systemctl_path, "status", sc.Name])
if retval is not 0:
if "Loaded: loaded" in process_stdout:
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if "Loaded: loaded" in process_stdout_str:
return True
else:
return False
Expand Down Expand Up @@ -926,13 +930,14 @@ def ModifySystemdService(sc):
(process_stdout, process_stderr, retval) = Process(
[systemctl_path, "status", sc.Name + '.service'])
# retval may be non zero even if service exists for 'status'.
if 'No such file or directory' in process_stdout:
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if 'No such file or directory' in process_stdout_str:
Print("Error: " + systemctl_path + " status " + sc.Name +
" failed: " + process_stderr, file=sys.stderr)
LG().Log('ERROR', "Error: " + systemctl_path +
" status " + sc.Name + " failed: " + process_stderr)
return [-1]
if 'Active: active' in process_stdout:
if 'Active: active' in process_stdout_str:
Print("Running", file=sys.stderr)
LG().Log('INFO', "Running")
if sc.State and sc.State != "running":
Expand Down Expand Up @@ -1132,7 +1137,8 @@ def ModifyInitService(sc):
LG().Log('ERROR', "Error: " + check_enabled_program +
" -f " + sc.Name + " defaults failed: " + process_stderr)
return [-1]
if 'already exist' in process_stdout: # we need to remove them first
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if 'already exist' in process_stdout_str: # we need to remove them first
(process_stdout, process_stderr, retval) = Process(
[check_enabled_program, "-f", sc.Name, "remove"])
if retval is not 0:
Expand Down Expand Up @@ -1190,7 +1196,8 @@ def ModifyInitService(sc):
LG().Log('ERROR', "Error: " + check_enabled_program +
" -f " + sc.Name + " defaults failed: " + process_stderr)
return [-1]
if 'already exist' in process_stdout: # we need to remove them first
process_stdout_str = process_stdout.decode() if isinstance(process_stdout, bytes) else process_stdout
if 'already exist' in process_stdout_str: # we need to remove them first
(process_stdout, process_stderr, retval) = Process(
[check_enabled_program, "-f", sc.Name, "remove"])
if retval is not 0:
Expand Down