Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 14:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

add return to output executioner

Browse Source
This commit is contained in:
Usman Nasir
2022-06-14 14:12:04 +05:00
parent 61c79eb779
commit bac238c387
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plogical/processUtilities.py
View File

@@ -289,7 +289,7 @@ class ProcessUtilities(multi.Thread):
return 0 return 0
@staticmethod @staticmethod
def outputExecutioner(command, user=None, shell = None, dir = None): def outputExecutioner(command, user=None, shell = None, dir = None, retRequired = None):
try: try:
if getpass.getuser() == 'root': if getpass.getuser() == 'root':
@@ -304,7 +304,18 @@ class ProcessUtilities(multi.Thread):
if type(command) == list: if type(command) == list:
command = " ".join(command) command = " ".join(command)
return ProcessUtilities.sendCommand(command, user, dir)[:-1] if retRequired:
ret = ProcessUtilities.sendCommand(command, user)
exitCode = ret[len(ret) - 1]
exitCode = int(codecs.encode(exitCode.encode(), 'hex'))
if exitCode == 0:
return 1, ret[:-1]
else:
return 0, ret[:-1]
else:
return ProcessUtilities.sendCommand(command, user, dir)[:-1]
except BaseException as msg: except BaseException as msg:
logging.writeToFile(str(msg) + "[outputExecutioner:188]") logging.writeToFile(str(msg) + "[outputExecutioner:188]")