Changeset 6961

Timestamp:

Mar 5, 2018, 1:51:06 PM (2 years ago)

Author:

Juanma

Message:

bugfix autoremove

Location:

taskscheduler/trunk/fuentes

Files:

• client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py (modified) (5 diffs)
• server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py (modified) (3 diffs)

taskscheduler/trunk/fuentes/client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py

@@ -17 +17 @@
                 self.cron_dir='/etc/cron.d'
                 self.count=0
-                self.dbg=0
-        #def __init__
+                self.dbg=1
 
         def startup(self,options):
@@ -24 +23 @@
                 t.daemon=True
                 t.start()
-        #def startup
 
         def _debug(self,msg):
                 if self.dbg:
                         print(str(msg))
-        #def _debug
 
         def _main_thread(self):
@@ -42 +39 @@
                         else:
                                 time.sleep(1)
-        #def _main_thread
 
         def process_tasks(self,data=None):
@@ -73 +69 @@
                                         sw_pass=False
                                         if 'autoremove' in tasks[name][serial]:
-                                                if type(tasks[name][serial]['mon'])==type(int):
-                                                        if tasks[name][serial]['mon']<today.month:
+                                                if (tasks[name][serial]['mon'].isdigit()):
+                                                        mon=int(tasks[name][serial]['mon'])
+                                                        if mon<today.month:
                                                                 sw_pass=True
                                                 if sw_pass==False:
-                                                        if type(tasks[name][serial]['dom'])==type(int):
-                                                                if tasks[name][serial]['dom']<today.day:
+                                                        if (tasks[name][serial]['dom'].isdigit()):
+                                                                dom=int(tasks[name][serial]['dom'])
+                                                                if dom<today.day:
                                                                         sw_pass=True
                                         if sw_pass:
@@ -86 +84 @@
                                         task_names[fname]=tasks[name][serial].copy()
                                         self._write_crontab_for_task(task_names,prefix)
+
         #def process_tasks
 

taskscheduler/trunk/fuentes/server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py

@@ -8 +8 @@
 import os
 import json
+from  datetime import date
 
 class SchedulerServer():
         def __init__(self):
-                self.dbg=0
+                self.dbg=1
                 self.tasks_dir="/etc/scheduler/tasks.d"
                 self.schedTasksDir=self.tasks_dir+"/scheduled"
@@ -31 +32 @@
 
         def get_local_tasks(self,*args):
+                today=date.today()
                 local_tasks={}
                 tasks_data=self._read_wrkfiles(self.tasks_dir)['data'].copy()
@@ -37 +39 @@
                         sw_continue=False
                         for serial,data in serial_data.items():
+                                print("DATA: %s"%data)
+                                sw_pass=False
+                                if 'autoremove' in data.keys():
+                                        if (data['mon'].isdigit()):
+                                                mon=int(data['mon'])
+                                                if mon<today.month:
+                                                        sw_pass=True
+                                        if sw_pass==False:
+                                                if (data['dom'].isdigit()):
+                                                        dom=int(data['dom'])
+                                                        if dom<today.day:
+                                                                sw_pass=True
+                                        if sw_pass:
+                                                task={}
+                                                self._debug("Autoremoving %s %s"%(task_name,serial))
+                                                task['name']=task_name
+                                                task['serial']=serial
+                                                self.remove_task(task)
+                                                continue
                                 if 'spread' in data.keys():
                                         if data['spread']==False: