Changeset 6961
- Timestamp:
- Mar 5, 2018, 1:51:06 PM (3 years ago)
- Location:
- taskscheduler/trunk/fuentes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
taskscheduler/trunk/fuentes/client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py
r6958 r6961 17 17 self.cron_dir='/etc/cron.d' 18 18 self.count=0 19 self.dbg=0 20 #def __init__ 19 self.dbg=1 21 20 22 21 def startup(self,options): … … 24 23 t.daemon=True 25 24 t.start() 26 #def startup27 25 28 26 def _debug(self,msg): 29 27 if self.dbg: 30 28 print(str(msg)) 31 #def _debug32 29 33 30 def _main_thread(self): … … 42 39 else: 43 40 time.sleep(1) 44 #def _main_thread45 41 46 42 def process_tasks(self,data=None): … … 73 69 sw_pass=False 74 70 if 'autoremove' in tasks[name][serial]: 75 if type(tasks[name][serial]['mon'])==type(int): 76 if tasks[name][serial]['mon']<today.month: 71 if (tasks[name][serial]['mon'].isdigit()): 72 mon=int(tasks[name][serial]['mon']) 73 if mon<today.month: 77 74 sw_pass=True 78 75 if sw_pass==False: 79 if type(tasks[name][serial]['dom'])==type(int): 80 if tasks[name][serial]['dom']<today.day: 76 if (tasks[name][serial]['dom'].isdigit()): 77 dom=int(tasks[name][serial]['dom']) 78 if dom<today.day: 81 79 sw_pass=True 82 80 if sw_pass: … … 86 84 task_names[fname]=tasks[name][serial].copy() 87 85 self._write_crontab_for_task(task_names,prefix) 86 88 87 #def process_tasks 89 88 -
taskscheduler/trunk/fuentes/server-scheduler.install/usr/share/n4d/python-plugins/SchedulerServer.py
r6866 r6961 8 8 import os 9 9 import json 10 from datetime import date 10 11 11 12 class SchedulerServer(): 12 13 def __init__(self): 13 self.dbg= 014 self.dbg=1 14 15 self.tasks_dir="/etc/scheduler/tasks.d" 15 16 self.schedTasksDir=self.tasks_dir+"/scheduled" … … 31 32 32 33 def get_local_tasks(self,*args): 34 today=date.today() 33 35 local_tasks={} 34 36 tasks_data=self._read_wrkfiles(self.tasks_dir)['data'].copy() … … 37 39 sw_continue=False 38 40 for serial,data in serial_data.items(): 41 print("DATA: %s"%data) 42 sw_pass=False 43 if 'autoremove' in data.keys(): 44 if (data['mon'].isdigit()): 45 mon=int(data['mon']) 46 if mon<today.month: 47 sw_pass=True 48 if sw_pass==False: 49 if (data['dom'].isdigit()): 50 dom=int(data['dom']) 51 if dom<today.day: 52 sw_pass=True 53 if sw_pass: 54 task={} 55 self._debug("Autoremoving %s %s"%(task_name,serial)) 56 task['name']=task_name 57 task['serial']=serial 58 self.remove_task(task) 59 continue 39 60 if 'spread' in data.keys(): 40 61 if data['spread']==False:
Note: See TracChangeset
for help on using the changeset viewer.