schain-jc Commit - r1159:d0480f11c356

Merge branch 'schain_alarm' into v2.3

Juan C. Espinoza -

r1159:d0480f11c356

parent child

Context file:

r1159:d0480f11c356

Collapse all files

schainpy/admin.py +15 -10

-            """The admin module contains all administrative classes relating to the schain python api.
+            """
+            The admin module contains all administrative classes relating to the schain python api.
             The main role of this module is to send some reports. It contains a
             notification class and a standard error handing class.
             from email.mime.application import MIMEApplication
             from email.mime.multipart import MIMEMultipart
+            import schainpy
             from schainpy.utils import log
             from schainpy.model.graphics.jroplot_data import popup
                 '''
                 modes:
 - All
-- Sound alarm
+- Send email
-- Send email
+- Popup message
-- Popup message
+- Sound alarm
 - Send to alarm system TODO
                 '''
-                def __init__(self, modes=[1], **kwargs):
+                def __init__(self, modes=[], **kwargs):
                     Process.__init__(self)
                     self.modes = modes
                     self.kwargs = kwargs
                 @staticmethod
                 def send_email(**kwargs):
                     notifier = SchainNotify()
+                    print kwargs
                     notifier.notify(**kwargs)
                 @staticmethod
-                def show_popup(message='Error'):
+                def show_popup(message):
+                    if isinstance(message, list):
+                        message = message[-1]
                     popup(message)
                 @staticmethod
                 def run(self):
                     tasks = {
 : self.send_email,
-: self.play_sound,
+: self.show_popup,
-: self.show_popup,
+: self.play_sound,
 : self.send_alarm,
                     }
                     tasks_args = {
 : ['email', 'message', 'subject', 'subtitle', 'filename'],
-: [],
+: ['message'],
-: ['message'],
+: [],
 : [],
                     }
                     procs = []

schainpy/controller.py +15 -8

                     self.id = None
                     self.description = None
                     self.email = None
-                    self.alarm = [0]
+                    self.alarm = None
                     self.plotterQueue = plotter_queue
                     self.procUnitConfObjDict = {}
                     self.procUnitConfObjDict = newProcUnitConfObjDict
-                def setup(self, id, name='', description='', email=None, alarm=[0]):
+                def setup(self, id, name='', description='', email=None, alarm=[3]):
                     print
                     print '*' * 60
                         self.__connect(puObjIN, thisPUObj)
-                def __handleError(self, procUnitConfObj, modes=None):
+                def __handleError(self, procUnitConfObj, modes=None, stdout=True):
                     import socket
                     message = ''.join(err)
-                    sys.stderr.write(message)
+                    if stdout:
+                        sys.stderr.write(message)
                     subject = 'SChain v%s: Error running %s\n' % (
                         schainpy.__version__, procUnitConfObj.name)
                         filename=self.filename
                     )
-                    a.start()
+                    return a
                 def isPaused(self):
                     return 0
                     keyList = self.procUnitConfObjDict.keys()
                     keyList.sort()
+                    err = None
                     while(True):
                         is_ok = False
                                 sts = procUnitConfObj.run()
                                 is_ok = is_ok or sts
                             except SchainWarning:
-                                self.__handleError(procUnitConfObj, modes=[2, 3])
+                                err = self.__handleError(procUnitConfObj, modes=[2, 3], stdout=False)
                             except KeyboardInterrupt:
                                 is_ok = False
                                 break
                             except ValueError, e:
                                 time.sleep(0.5)
-                                self.__handleError(procUnitConfObj)
+                                err = self.__handleError(procUnitConfObj)
                                 is_ok = False
                                 break
                             except:
                                 time.sleep(0.5)
-                                self.__handleError(procUnitConfObj)
+                                err = self.__handleError(procUnitConfObj)
                                 is_ok = False
                                 break
                         procUnitConfObj = self.procUnitConfObjDict[procKey]
                         procUnitConfObj.close()
+                    if err is not None:
+                        err.start()
+                        # err.join()
                     log.success('{} finished (time: {}s)'.format(
                         self.name,
                         time.time()-self.start_time))

schainpy/model/graphics/jroplot_data.py +10 -3

                         canvas = figManager.canvas
                         if canvas.figure.stale:
                             canvas.draw()
-                        canvas.start_event_loop(interval)
+                        try:
+                            canvas.start_event_loop(interval)
+                        except:
+                            pass
                         return
             def popup(message):
-                fig = plt.figure(figsize=(12, 8), facecolor='r')
+                '''
-                fig.text(0.5, 0.5, message, ha='center', va='center', size='20', weight='heavy', color='w')
+                '''
+                fig = plt.figure(figsize=(12, 8), facecolor='r')
+                text = '\n'.join([s.strip() for s in message.split(':')])
+                fig.text(0.01, 0.5, text, ha='left', va='center', size='20', weight='heavy', color='w')
                 fig.show()
                 figpause(1000)

schainpy/model/io/jroIO_base.py +8 -8

             except:
                 from time import sleep
+            import schainpy.admin
             from schainpy.model.data.jroheaderIO import PROCFLAG, BasicHeader, SystemHeader, RadarControllerHeader, ProcessingHeader
             from schainpy.model.data.jroheaderIO import get_dtype_index, get_numpy_dtype, get_procflag_dtype, get_dtype_width
             from schainpy.utils import log
                             firstTime_flag = False
-                            print "\t[Reading] Skipping the file \"%s\" due to this file doesn't exist" % filename
+                            log.warning('Skipping the file {} due to this file doesn\'t exist'.format(filename))
                             self.set += 1
                             # si no encuentro el file buscado cambio de carpeta y busco en la siguiente carpeta
                         self.flagIsNewFile = 0
                         self.fp = None
                         self.flagNoMoreFiles = 1
-            #             print '[Reading] No more files to read'
                     return fileOk_flag
                     else:
                         newFile = self.__setNextFileOffline()
                     if not(newFile):
-                        print '[Reading] No more files to read'
+                        raise schainpy.admin.SchainWarning('No more files to read')
                         return 0
                     if self.verbose:
                                 if fullpath:
                                     break
-                                print '[Reading] Waiting %0.2f sec for an valid file in %s: try %02d ...' % (self.delay, path, nTries + 1)
+                                print '[Reading] Waiting %0.2f sec for an valid file in %s: try %02d ...' % (delay, path, nTries + 1)
-                                sleep(self.delay)
+                                sleep(delay)
                             if not(fullpath):
-                                print "[Reading] There 'isn't any valid file in %s" % path
+                                raise schainpy.admin.SchainWarning('There isn\'t any valid file in {}'.format(path))
                                 return
                             self.year = year

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages