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

bug fix: remote extra logging from application installer

Browse Source
This commit is contained in:
Usman Nasir
2020-11-10 14:18:07 +05:00
parent cb741771e1
commit 42bdd0378e
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plogical/CyberCPLogFileWriter.py
View File

@@ -106,7 +106,5 @@ Subject: %s
statusFile = open(tempStatusPath, 'a')
statusFile.writelines(mesg + '\n')
statusFile.close()
print((mesg + '\n'))
except BaseException as msg:
CyberCPLogFileWriter.writeToFile(str(msg) + ' [statusWriter]')
#print str(msg)

13
plogical/applicationInstaller.py
View File

@@ -899,16 +899,23 @@ $parameters = array(
if self.dataLossCheck(finalPath, tempStatusPath) == 0:
raise BaseException('Directory is not empty.')
command = 'composer global require joomlatools/console'
ProcessUtilities.outputExecutioner(command, externalApp, None, self.permPath)
### Decide joomla console path
import getpass
if getpass.getuser() == 'root':
command = 'export COMPOSER_ALLOW_SUPERUSER=1;composer global require joomlatools/console'
ProcessUtilities.outputExecutioner(command, externalApp, None, self.permPath)
joomlaPath = '/root/.config/composer/vendor/bin/joomla'
else:
joomlaPath = '/home/%s/.composer/vendor/bin/joomla' % (self.masterDomain)
command = 'composer global require joomlatools/console'
ProcessUtilities.outputExecutioner(command, externalApp, None, self.permPath)
if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
joomlaPath = '/home/%s/.composer/vendor/bin/joomla' % (self.masterDomain)
else:
joomlaPath = '/home/%s/.config/composer/vendor/bin/joomla' % (self.masterDomain)
## Run the install command

7
plogical/processUtilities.py
View File

@@ -106,10 +106,13 @@ class ProcessUtilities(multi.Thread):
try:
if os.path.exists(ProcessUtilities.debugPath):
logging.writeToFile(command)
f = open(os.devnull, 'w')
if shell == False:
res = subprocess.call(shlex.split(command))
res = subprocess.call(shlex.split(command), stdout=f, stderr=f)
else:
res = subprocess.call(command, shell=shell)
res = subprocess.call(command, shell=shell, stdout=f, stderr=f)
if res == 0:
return 1