Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-03-06 12:20:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: fetch logs

Browse Source
This commit is contained in:
Usman Nasir
2019-11-26 13:36:17 +05:00
parent d11eb06812
commit 7f036727ef
4 changed files with 87 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plogical/virtualHostUtilities.py
View File

@@ -290,17 +290,17 @@ class virtualHostUtilities:
return 0, str(msg)
@staticmethod
def getAccessLogs(fileName, page):
def getAccessLogs(fileName, page, externalApp):
try:
if os.path.islink(fileName):
print "0, %s file is symlinked." % (fileName)
return 0
numberOfTotalLines = int(subprocess.check_output(["wc", "-l", fileName]).split(" ")[0])
numberOfTotalLines = int(ProcessUtilities.outputExecutioner('wc -l %s' % (fileName), externalApp).split(" ")[0])
if numberOfTotalLines < 25:
data = subprocess.check_output(["cat", fileName])
data = ProcessUtilities.outputExecutioner('cat %s' % (fileName), externalApp)
else:
if page == 1:
end = numberOfTotalLines
@@ -309,8 +309,7 @@ class virtualHostUtilities:
start = 1
startingAndEnding = "'" + str(start) + "," + str(end) + "p'"
command = "sed -n " + startingAndEnding + " " + fileName
proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
data = proc.stdout.read()
data = ProcessUtilities.outputExecutioner(command, externalApp)
else:
end = numberOfTotalLines - ((page - 1) * 25)
start = end - 24
@@ -318,26 +317,28 @@ class virtualHostUtilities:
start = 1
startingAndEnding = "'" + str(start) + "," + str(end) + "p'"
command = "sed -n " + startingAndEnding + " " + fileName
proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
data = proc.stdout.read()
data = ProcessUtilities.outputExecutioner(command, externalApp)
print data
return data
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(
str(msg) + " [getAccessLogs]")
print "1,None"
return "1,None"
@staticmethod
def getErrorLogs(fileName, page):
def getErrorLogs(fileName, page, externalApp):
try:
if os.path.islink(fileName):
print "0, %s file is symlinked." % (fileName)
return 0
numberOfTotalLines = int(subprocess.check_output(["wc", "-l", fileName]).split(" ")[0])
numberOfTotalLines = int(
ProcessUtilities.outputExecutioner('wc -l %s' % (fileName), externalApp).split(" ")[0])
if numberOfTotalLines < 25:
data = subprocess.check_output(["cat", fileName])
data = ProcessUtilities.outputExecutioner('cat %s' % (fileName), externalApp)
else:
if page == 1:
end = numberOfTotalLines
@@ -346,8 +347,7 @@ class virtualHostUtilities:
start = 1
startingAndEnding = "'" + str(start) + "," + str(end) + "p'"
command = "sed -n " + startingAndEnding + " " + fileName
proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
data = proc.stdout.read()
data = ProcessUtilities.outputExecutioner(command, externalApp)
else:
end = numberOfTotalLines - ((page - 1) * 25)
start = end - 24
@@ -355,13 +355,14 @@ class virtualHostUtilities:
start = 1
startingAndEnding = "'" + str(start) + "," + str(end) + "p'"
command = "sed -n " + startingAndEnding + " " + fileName
proc = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE)
data = proc.stdout.read()
data = ProcessUtilities.outputExecutioner(command, externalApp)
print data
return data
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(
str(msg) + " [getErrorLogs]")
print "1,None"
return "1,None"
@staticmethod
def saveVHostConfigs(fileName, tempPath):