simple doClean Flag
This commit is contained in:
parent
84a283b4c2
commit
251c1e53fc
@ -15,6 +15,7 @@ config = json.load(_config_fp)
|
|||||||
_config_fp.close()
|
_config_fp.close()
|
||||||
bypy = ByPy()
|
bypy = ByPy()
|
||||||
doCleanTime = datetime.now()
|
doCleanTime = datetime.now()
|
||||||
|
_clean_flag = None
|
||||||
|
|
||||||
network = {
|
network = {
|
||||||
"currentTime": datetime.now(),
|
"currentTime": datetime.now(),
|
||||||
@ -47,7 +48,7 @@ def getTimeDelta(a, b):
|
|||||||
|
|
||||||
|
|
||||||
def _doClean(_force=False):
|
def _doClean(_force=False):
|
||||||
global doCleanTime
|
global doCleanTime, _clean_flag
|
||||||
_disk = psutil.disk_usage(".")
|
_disk = psutil.disk_usage(".")
|
||||||
if (_disk.percent > config["max"] and getTimeDelta(datetime.now(), doCleanTime) > 7200) or _force:
|
if (_disk.percent > config["max"] and getTimeDelta(datetime.now(), doCleanTime) > 7200) or _force:
|
||||||
doCleanTime = datetime.now()
|
doCleanTime = datetime.now()
|
||||||
@ -57,6 +58,7 @@ def _doClean(_force=False):
|
|||||||
break
|
break
|
||||||
doCleanTime = datetime.now()
|
doCleanTime = datetime.now()
|
||||||
if (datetime.now() - datetime.utcfromtimestamp(os.path.getmtime(_i))).days > config["exp"]:
|
if (datetime.now() - datetime.utcfromtimestamp(os.path.getmtime(_i))).days > config["exp"]:
|
||||||
|
_clean_flag = True
|
||||||
if config["dow"] == "bypy":
|
if config["dow"] == "bypy":
|
||||||
_res = bypy.upload(_i)
|
_res = bypy.upload(_i)
|
||||||
if _res == 0:
|
if _res == 0:
|
||||||
@ -66,9 +68,13 @@ def _doClean(_force=False):
|
|||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
doCleanTime = datetime.now()
|
doCleanTime = datetime.now()
|
||||||
|
_clean_flag = False
|
||||||
|
|
||||||
|
|
||||||
def doClean(_force=False):
|
def doClean(_force=False):
|
||||||
|
if _clean_flag:
|
||||||
|
appendError("doClean request on cleaning, will ignore it")
|
||||||
|
return
|
||||||
p = threading.Thread(target=_doClean, args=(_force,))
|
p = threading.Thread(target=_doClean, args=(_force,))
|
||||||
p.setDaemon(True)
|
p.setDaemon(True)
|
||||||
p.start()
|
p.start()
|
||||||
|
Reference in New Issue
Block a user