Skip to content

Revise set_schedule_log function #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stvreumi wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Revise set_schedule_log function #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions arrange_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,18 +359,15 @@ def clean_schedule():
return return_msg

#The API connect mysql and clean up schedule and write it to the schedule.txt
def set_schedule_log(json_obj):
def set_schedule_log(log_dir="", max_is_used=100):
"""
When used_schudule_count is larger than `max_is_used`,
this function will log used schedule into log_dir
and clean them from database.
"""
return_msg = {}
return_msg["result"] = "fail"
log_dir = ""
max_is_used = 100
is_used_count = 0
try:
log_dir = json_obj["board_py_dir"]
max_is_used = json_obj["max_db_log"]
except:
return_msg["error"] = "input parameter missing"
return return_msg

with ScheduleDao() as scheduleDao:
is_used_count = scheduleDao.countUsedSchedule()
Expand Down Expand Up @@ -1055,8 +1052,7 @@ def do_expire_data_check():
def do_set_schedule_log():
global board_py_dir
global max_db_log
send_obj = dict(board_py_dir=board_py_dir,max_db_log=max_db_log)
receive_obj = set_schedule_log(send_obj)
receive_obj = set_schedule_log(board_py_dir, max_db_log)
if receive_obj["result"] == "success":
"DO NOTHING"
else :
Expand Down
9 changes: 4 additions & 5 deletions test/test_02_arrange_schedule.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ def test_crawler_constellation_fortune(self):
receive_msg = crawler_constellation_fortune()
self.assertEqual(receive_msg['result'], 'success')

def test_set_schedule_log(self):
send_msg = {}
send_msg['board_py_dir'] = self.system_setting['board_py_dir']
send_msg['max_db_log'] = self.system_setting['max_db_log']
receive_msg = set_schedule_log(send_msg)
def test_set_schedule_log(self):
receive_msg = set_schedule_log(
self.system_setting['board_py_dir'],
self.system_setting['max_db_log'])
self.assertEqual(receive_msg['result'],'success')

def test_expire_data_check(self):
Expand Down