pull/109/head
midoks 7 years ago
parent 350df66aab
commit 1c03243d9a
  1. 22
      class/public.py
  2. 2
      route/files.py
  3. 8
      task.py

@ -241,15 +241,14 @@ def getSpeed():
return json.loads(data) return json.loads(data)
def GetLastLine(inputfile, lineNum): def getLastLine(inputfile, lineNum):
# 读文件指定倒数行数 # 读文件指定倒数行数
try: try:
fp = open(inputfile, 'r') fp = open(inputfile, 'r')
print fp
lastLine = "" lastLine = ""
lines = fp.readlines() lines = fp.readlines()
print lines
count = len(lines) count = len(lines)
if count > lineNum: if count > lineNum:
num = lineNum num = lineNum
@ -265,17 +264,14 @@ def GetLastLine(inputfile, lineNum):
lastre.append(lastLine) lastre.append(lastLine)
result = '' result = ''
lineNum -= 1 num -= 1
print lastre while num > 0:
while lineNum > 0: print num
print lineNum lastre[num]
# lastre[lineNum] result += lastre[num] + "\n"
# result += lastre[lineNum] + "\n" num -= 1
lineNum -= 1
return result return result
except (IOError, ZeroDivisionError), e: except:
# print e.message
return getMsg('TASK_SLEEP') return getMsg('TASK_SLEEP')

@ -28,7 +28,7 @@ def GetExecLog():
file = os.getcwd() + "/tmp/panelExec.log" file = os.getcwd() + "/tmp/panelExec.log"
print file print file
v = public.GetLastLine(file, 100) v = public.getLastLine(file, 100)
return v return v

@ -28,8 +28,12 @@ isTask = os.getcwd() + '/tmp/panelTask.pl'
if ~os.path.exists(os.getcwd() + "/tmp"): if ~os.path.exists(os.getcwd() + "/tmp"):
os.system('mkdir -p ' + os.getcwd() + "/tmp") os.system('mkdir -p ' + os.getcwd() + "/tmp")
os.system("echo '' > " + logPath)
os.system("echo '' > " + isTask) if ~os.path.exists(logPath):
os.system("touch " + logPath)
if ~os.path.exists(isTask):
os.system("touch " + isTask)
class MyBad(): class MyBad():

Loading…
Cancel
Save