fix: if disk will full , delete some record file

This commit is contained in:
Jerry Yan 2019-04-10 21:11:40 +08:00 committed by JerryYan
parent e77fa5d6ad
commit 6c02b965b0
3 changed files with 9 additions and 11 deletions

View File

@ -43,8 +43,6 @@ def getTimeDelta(a, b):
def getCurrentStatus(): def getCurrentStatus():
_disk = psutil.disk_usage("/") _disk = psutil.disk_usage("/")
if _disk.percent > 85:
os.system("rm -f `find . -ctime 1 -name '*.flv'`")
_mem = psutil.virtual_memory() _mem = psutil.virtual_memory()
_net = psutil.net_io_counters() _net = psutil.net_io_counters()
_delta= getTimeDelta(datetime.now(),network["currentTime"]) _delta= getTimeDelta(datetime.now(),network["currentTime"])
@ -52,6 +50,8 @@ def getCurrentStatus():
_inSpeed = (_net.bytes_recv - network["in"]["currentByte"])/_delta _inSpeed = (_net.bytes_recv - network["in"]["currentByte"])/_delta
_outSpeed = (_net.bytes_sent - network["out"]["currentByte"])/_delta _outSpeed = (_net.bytes_sent - network["out"]["currentByte"])/_delta
else: else:
if _disk.percent > 85:
os.system(r"find ./ \( -mtime 1 -o -mtime 2 -o -mtime 3 \) -name '*.flv' -delete")
_outSpeed = 0 _outSpeed = 0
_inSpeed = 0 _inSpeed = 0
updateNetwork() updateNetwork()

View File

@ -198,14 +198,14 @@ def fileDownload(path):
def SubThread(): def SubThread():
t = threading.Thread(target=RUN, args=(Common.config['l_u'],)) t = threading.Thread(target=RUN, args=())
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()
while True: while True:
if t.is_alive(): if t.is_alive():
sleep(240) sleep(240)
else: else:
t = threading.Thread(target=RUN, args=(Common.config['l_u'],)) t = threading.Thread(target=RUN, args=())
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()

View File

@ -50,25 +50,23 @@
<table> <table>
<tr> <tr>
<td>下载日志</td> <td>下载日志</td>
<td colspan="2"><span id="download"></span></td> <td><span id="download"></span></td>
</tr> </tr>
<tr> <tr>
<td>转码日志</td> <td>转码日志<br>队列<span id="encodeQueueSize"></span></td>
<td>转码队列<br><span id="encodeQueueSize"></span></td>
<td><span id="encode"></span></td> <td><span id="encode"></span></td>
</tr> </tr>
<tr> <tr>
<td>上传日志</td> <td>上传日志<br>队列<span id="uploadQueueSize"></span></td>
<td>上传队列<br><span id="uploadQueueSize"></span></td>
<td><span id="upload"></span></td> <td><span id="upload"></span></td>
</tr> </tr>
<tr> <tr>
<td>错误日志</td> <td>错误日志</td>
<td colspan="2"><span id="error"></span></td> <td><span id="error"></span></td>
</tr> </tr>
<tr> <tr>
<td>操作日志</td> <td>操作日志</td>
<td colspan="2"><span id="operation"></span></td> <td><span id="operation"></span></td>
</tr> </tr>
</table> </table>
<hr/> <hr/>