shareddata 3.6.2__tar.gz → 3.7.1__tar.gz

{shareddata-3.6.2/src/shareddata.egg-info → shareddata-3.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shareddata
-Version: 3.6.2
+Version: 3.7.1
 Summary: Shared Memory Database with S3 repository
 Home-page: https://github.com/jcarlitooliveira/SharedData
 Author: Jose Carlito de Oliveira Filho

{shareddata-3.6.2 → shareddata-3.7.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = shareddata
-version = 3.6.2
+version = 3.7.1
 author = Jose Carlito de Oliveira Filho
 author_email = jcarlitooliveira@gmail.com
 description = Shared Memory Database with S3 repository

{shareddata-3.6.2 → shareddata-3.7.1}/src/SharedData/Routines/Schedule.py

@@ -285,11 +285,13 @@ class Schedule:
         sched = self.schedule
 
         # Run pending routines
-        dfpending = sched[sched['status'] == 'PENDING']
-
+        idx = sched['status'] == 'PENDING'
+        idx = (idx) | (sched['status'] == 'START')
+        idx = (idx) | (sched['status'] == 'RESTART')
+        dfpending = sched[idx]        
         for i in dfpending.index:
             r = dfpending.loc[i].copy()
-            if str(r['lastmsg']) == 'nan':
+            if (str(r['lastmsg']) == 'nan') | (r['status']=='RESTART'):
                 newcommand = True
                 target = r['computer']
 
@@ -302,14 +304,19 @@ class Schedule:
                     branch = ''
                     repo = r['script'].split('/')[0]
                     routine = r['script'].replace(repo, '')[1:]+'.py'
+                
+                job = "routine"
+                if r['status']=='RESTART':
+                    job = "restart"
 
                 data = {
                     "sender": "MASTER",
-                    "job": "routine",
+                    "job": job,
                     "target": target,
                     "repo": repo,
                     "routine": routine
                 }
+            
                 if branch != '':
                     data['branch'] = branch
 

{shareddata-3.6.2 → shareddata-3.7.1}/src/SharedData/Routines/Worker.py

@@ -138,37 +138,24 @@ while True:
                             Logger.log.info(statusstr)
 
                     elif command['job'] == 'kill':
-                        if command['repo'] == 'ALL':
-                            Logger.log.info('Kill: ALL...')
-                            for routine in routines:
-                                try:
-                                    routine['process'].kill()
-                                except:
-                                    pass
-                            Logger.log.info('Kill: ALL DONE!')
-                        else:
-                            for routine in routines:
-                                kill = False
-                                if (routine['command']['repo'] == command['repo']):
-                                    if 'routine' in command:
-                                        if (routine['command']['routine'] == command['routine']):
-                                            kill = True
-                                    else:
-                                        kill = True
-
-                                if (kill) & ('process' in routine):
-                                    try:
-                                        routine['process'].kill()
-                                        if 'routine' in command:
-                                            Logger.log.info('Kill: %s/%s %.2fs DONE!' %
-                                                            (routine['command']['repo'], routine['command']['routine'],
-                                                             time.time()-routine['start_time']))
-                                        else:
-                                            Logger.log.info('Kill: %s %.2fs DONE!' %
-                                                            (routine['command']['repo'], time.time()-routine['start_time']))
-                                    except:
-                                        pass
-
+                        kill_routine(command,routines)
+
+                    elif command['job'] == 'restart':
+                        kill_routine(command,routines)
+                        
+                        start_time = time.time()
+                        routine = {
+                            'command': command,
+                            'thread': None,
+                            'process': None,
+                            'start_time': start_time,
+                        }
+                        thread = Thread(target=run_routine,
+                                        args=(command, routine))
+                        routine['thread'] = thread
+                        routines.append(routine)
+                        thread.start()
+                    
                     elif command['job'] == 'restart worker':
                         restart_program()
 

{shareddata-3.6.2 → shareddata-3.7.1}/src/SharedData/Routines/WorkerLib.py

@@ -137,7 +137,7 @@ def list_proc():
             pinfo = proc.as_dict(attrs=None)
             if len(pinfo['cmdline']) > 0:
                 if str(source_path) in pinfo['cmdline'][0]:
-                    procdict[proc.pid] = {'proc': proc, 'pinfo': pinfo}                    
+                    procdict[proc.pid] = {'proc': proc, 'pinfo': pinfo}
         except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
             pass
     return procdict
@@ -200,13 +200,46 @@ def run_routine(command, routine):
 
         routine['process'] = subprocess.Popen(cmd, env=env)
 
-
         Logger.log.info('Starting process %s/%s DONE!' %
                         (command['repo'], command['routine']))
     else:
         Logger.log.error(
             'Aborting routine %s, could not install repo' % (command['routine']))
 
+def kill_routine(command, routines):
+    if command['repo'] == 'ALL':
+        Logger.log.info('Kill: ALL...')
+        for routine in routines:
+            try:
+                routine['process'].kill()
+                routines.remove(routine)
+            except:
+                pass
+        Logger.log.info('Kill: ALL DONE!')
+    else:
+        for routine in routines:
+            kill = False
+            if (routine['command']['repo'] == command['repo']):
+                if 'routine' in command:
+                    if (routine['command']['routine'] == command['routine']):
+                        kill = True
+                else:
+                    kill = True
+
+            if (kill) & ('process' in routine):
+                try:
+                    routine['process'].kill()
+                    routines.remove(routine)                    
+                    if 'routine' in command:
+                        Logger.log.info('Kill: %s/%s %.2fs DONE!' %
+                                        (routine['command']['repo'], routine['command']['routine'],
+                                            time.time()-routine['start_time']))
+                    else:
+                        Logger.log.info('Kill: %s %.2fs DONE!' %
+                                        (routine['command']['repo'], time.time()-routine['start_time']))
+                except:
+                    pass
+
 
 def install_repo(command, routine=None):
 
@@ -319,6 +352,7 @@ def install_repo(command, routine=None):
         Logger.log.error('Installing %s ERROR!' % (command['repo']))
     return runroutine
 
+
 def start_schedules(schedule_names):
     # run logger
     command = {
@@ -326,7 +360,7 @@ def start_schedules(schedule_names):
         "target": os.environ['USER_COMPUTER'],
         "job": "routine",
         "repo": "SharedData",
-        "routine": "Routines.ReadLogs",        
+        "routine": "Routines.ReadLogs",
     }
     start_time = time.time()
     routine = {
@@ -337,7 +371,7 @@ def start_schedules(schedule_names):
     }
     run_routine(command, routine)
 
-    #run scheduler
+    # run scheduler
     command = {
         "sender": "MASTER",
         "target": os.environ['USER_COMPUTER'],
@@ -354,8 +388,4 @@ def start_schedules(schedule_names):
         'start_time': start_time,
     }
     run_routine(command, routine)
-    # thread = Thread(target=run_routine,
-    #     args=(command, routine))
-    # routine['thread'] = thread
-    # routines.append(routine)
-    # thread.start()
+    

{shareddata-3.6.2 → shareddata-3.7.1/src/shareddata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shareddata
-Version: 3.6.2
+Version: 3.7.1
 Summary: Shared Memory Database with S3 repository
 Home-page: https://github.com/jcarlitooliveira/SharedData
 Author: Jose Carlito de Oliveira Filho