From 87a17d39f0f9676a5a9947882c11aefb950548a2 Mon Sep 17 00:00:00 2001
From: Dennis Chung <stvreumi@livemail.tw>
Date: Sat, 9 Jun 2018 20:38:45 +0800
Subject: [PATCH] Revise set_schedule_log function

---
 arrange_schedule.py              | 18 +++++++-----------
 test/test_02_arrange_schedule.py |  9 ++++-----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/arrange_schedule.py b/arrange_schedule.py
index 5623e95..c944334 100644
--- a/arrange_schedule.py
+++ b/arrange_schedule.py
@@ -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()
@@ -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 :
diff --git a/test/test_02_arrange_schedule.py b/test/test_02_arrange_schedule.py
index b252be8..2964bd9 100644
--- a/test/test_02_arrange_schedule.py
+++ b/test/test_02_arrange_schedule.py
@@ -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):