Changeset 6823

Timestamp:

Feb 15, 2018, 1:21:25 PM (3 years ago)

Author:

Juanma

Message:

refactorized

File:

• taskscheduler/trunk/fuentes/client-scheduler.install/usr/share/n4d/python-plugins/SchedulerClient.py (modified) (4 diffs)

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

@@ -10 +10 @@
 from  datetime import date
 import xmlrpclib as xmlrpc
+
+
 
 class SchedulerClient():
@@ -52 +54 @@
                         if prefix=='remote':
                                 n4d=xmlrpc.ServerProxy("https://server:9779")
+                                tasks=n4d.get_remote_tasks("","SchedulerServer").copy()
                         else:
                                 n4d=xmlrpc.ServerProxy("https://localhost:9779")
-                        tasks=n4d.get_tasks("","SchedulerServer")['data'].copy()
+                                tasks=n4d.get_tasks("","SchedulerServer")['data'].copy()
 
                         #Delete files
@@ -77 +80 @@
                                         self._debug("Scheduling %s"%name)
                                         fname=name.replace(' ','_')
-                                        task_names[fname]=tasks[name][serial].copy()
+                                        if fname in task_names.keys():
+                                                task_names[fname].update(tasks[name][serial].copy())
+                                        else:
+                                                task_names[fname]=tasks[name][serial].copy()
                                         self._write_crontab_for_task(task_names,prefix)
 
@@ -90 +96 @@
                                                         task_data['mon'],task_data['dow'],u""+task_data['cmd']))
                         cron_array.append(cron_task)
-#                       for task_serial,task_info in task_data.items():
-#                               cron_task=("%s %s %s %s %s root %s"%(task_info['m'],task_info['h'],task_info['dom'],\
-#                                                               task_info['mon'],task_info['dow'],task_info['cmd']))
-#                               cron_array.append(cron_task)
                         if task_data:
-                                with open(fname,'w') as data:
-                                        data.write('#Scheduler tasks\n')
-                                        data.write('SHELL=/bin/bash\n')
-                                        data.write('PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n')
-                                        data.write('DISPLAY=:0\n')
-                                        data.write('XAUTHORITY=/var/run/lightdm/root/:0\n')
-                                        if 'https_proxy' in os.environ.keys():
-                                                https_proxy=os.environ['https_proxy']
-                                                data.write('https_proxy=%s\n'%https_proxy)
-                                        if 'http_proxy' in os.environ.keys():
-                                                http_proxy=os.environ['http_proxy']
-                                                data.write('http_proxy=%s\n'%http_proxy)
+                                if os.path.isfile(fname):
+                                        mode="a"
+                                else:
+                                        mode="w"
+                                with open(fname,mode) as data:
+                                        if mode=="w":
+                                                data.write('#Scheduler tasks\n')
+                                                data.write('SHELL=/bin/bash\n')
+                                                data.write('PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin\n')
+                                                data.write('DISPLAY=:0\n')
+                                                data.write('XAUTHORITY=/var/run/lightdm/root/:0\n')
+                                                if 'https_proxy' in os.environ.keys():
+                                                        https_proxy=os.environ['https_proxy']
+                                                        data.write('https_proxy=%s\n'%https_proxy)
+                                                if 'http_proxy' in os.environ.keys():
+                                                        http_proxy=os.environ['http_proxy']
+                                                        data.write('http_proxy=%s\n'%http_proxy)
                                         for cron_line in cron_array:
                                                 data.write(cron_line.encode('utf8')+"\n")