devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

run_daemon 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-05-06 22:58:58 +09:00
parent f155a341cb
commit b8a8776c2e
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/run_daemon.py
+15 -10
View File
@@ -8,7 +8,7 @@ import concurrent.futures
from datetime import datetime from datetime import datetime
ONE_FILE_LOOP_SEC = 60 ONE_FILE_LOOP_SEC = 60
ONE_LOOP_TIME_SEC = 6 ONE_LOOP_TIME_SEC = 8
RETRY_SEC = 2 RETRY_SEC = 2
def getCurrentMillisecTime(): def getCurrentMillisecTime():
@@ -18,7 +18,7 @@ def getCurrentMillisecTime():
def run(webPath): def run(webPath):
for _ in range(5): for _ in range(5):
now = datetime.now() now = datetime.now()
print(now.strftime("%Y-%m-%d %H:%M:%S"), webPath) print(now.strftime("%Y-%m-%d %H:%M:%S"), webPath, flush=True)
startTime = getCurrentMillisecTime() startTime = getCurrentMillisecTime()
obj = urllib.request.urlopen(webPath) obj = urllib.request.urlopen(webPath)
@@ -31,6 +31,8 @@ def run(webPath):
return getCurrentMillisecTime() return getCurrentMillisecTime()
def main(): def main():
startTime = getCurrentMillisecTime()
basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
hiddenList = [] hiddenList = []
@@ -65,27 +67,30 @@ def main():
with concurrent.futures.ThreadPoolExecutor(max_workers=max(1,len(servList))) as executor: with concurrent.futures.ThreadPoolExecutor(max_workers=max(1,len(servList))) as executor:
waiters={} waiters={}
startTime = getCurrentMillisecTime()
waitTick = 1.0 / max(len(autoResetList), 1) waitTick = 1.0 / max(len(autoResetList), 1)
for servRelPath, resetPath in autoResetList: for servRelPath, resetPath in autoResetList:
future = executor.submit(run, resetPath) future = executor.submit(run, resetPath)
waiters[servRelPath] = future waiters[servRelPath] = future
time.sleep(waitTick) time.sleep(waitTick)
currTime = getCurrentMillisecTime()
waitTick = ONE_LOOP_TIME_SEC / max(len(servList), 1) waitTick = ONE_LOOP_TIME_SEC / max(len(servList), 1)
while currTime - startTime < ONE_FILE_LOOP_SEC*1000: doLoop = True
while doLoop:
for servRelPath, webPath in servList: for servRelPath, webPath in servList:
if servRelPath in waiters and not waiters[servRelPath].done(): if servRelPath in waiters and not waiters[servRelPath].done():
continue continue
waiters[servRelPath] = executor.submit(run, webPath) waiters[servRelPath] = executor.submit(run, webPath)
time.sleep(waitTick) time.sleep(waitTick)
currTime = getCurrentMillisecTime() currTime = getCurrentMillisecTime()
if currTime - startTime >= ONE_FILE_LOOP_SEC*1000:
doLoop = False
break
for future in waiters.values(): for future in waiters.values():
future.result(None) future.result()
now = datetime.now()
print('Done', now.strftime("%Y-%m-%d %H:%M:%S"))
if __name__ == "__main__": if __name__ == "__main__":
# execute only if run as a script # execute only if run as a script