Ignore:
Timestamp:
04/03/10 18:42:09 (2 years ago)
Author:
dart
Message:

I18n:
o Last translations update

LoPlug?:
o Fix last deliveries for logger (need more work later)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loplug/plugins/common/pgpluginclient.py

    r1939 r1944  
    5757        self.options = options 
    5858         
    59         loggerMessageHeader = "[Plug-%s]" % self.get_name() 
     59        loggerMessageHeader = "[LoPlug]" 
    6060        self.logger = logging.getLogger( loggerMessageHeader) 
    6161         
     
    7878        self.create_plug_context() 
    7979        self.load_config() 
    80  
     80#---------------------------------------------------------------- 
     81    ## Constructor 
     82    # @param self                      instance class 
     83    def debug( self, msg,  level="debug"): 
     84        f = "[%s] %s" 
     85        if level == "warning": 
     86            self.logger.warning( f % (self.get_name(),  msg)) 
     87        elif level == "info": 
     88            self.logger.info( f % (self.get_name(),  msg)) 
     89        elif level == "error": 
     90            self.logger.error( f % (self.get_name(),  msg)) 
     91        else: 
     92            self.logger.debug( f % (self.get_name(),  msg)) 
     93#---------------------------------------------------------------- 
     94    ## Constructor 
     95    # @param self                      instance class 
     96    def error( self, msg): 
     97        self.debug( msg,  "error") 
     98#---------------------------------------------------------------- 
     99    ## Constructor 
     100    # @param self                      instance class 
     101    def info( self, msg): 
     102        self.debug( msg,  "info") 
    81103#---------------------------------------------------------------- 
    82104    # Tells if this plug is a provider or not 
     
    304326            self.cnxObj = CnxObj( sock) 
    305327        except socket.error, msg: 
    306             self.logger.error( socket.error, msg ) 
     328            self.error( socket.error, msg ) 
    307329            return 
    308330 
     
    430452    # @param self                      instance class 
    431453    def __rxThreadEntryPoint__( self): 
    432         self.logger.info( "Rx thread started") 
     454        self.info( "Rx thread started") 
    433455        while( self.goOn): 
    434456            # Wait and get message from the server. 
     
    437459            except: 
    438460                # Connection probably reset by peer 
    439                 self.logger.info( "An error occurs on recv()") 
     461                self.info( "An error occurs on recv()") 
    440462                return 
    441463                 
    442464            if len( rxFrames[0]): 
    443                 # self.logger.info( "Buffer received") 
     465                # self.info( "Buffer received") 
    444466                for rxFrame in rxFrames: 
    445467                    self.__parse__( rxFrame) 
    446468               
    447469            else:   
    448                 self.logger.debug( "[%s] Socket closed" % self.get_name() ) 
     470                self.debug( "[%s] Socket closed" % self.get_name() ) 
    449471        # End of: while( self.goOn) 
    450         self.logger.info( "[%s] Exit rx loop" % self.get_name() ) 
     472        self.info( "[%s] Exit rx loop" % self.get_name() ) 
    451473 
    452474#---------------------------------------------------------------- 
     
    525547    # @param self instance class 
    526548    def _create_plug_context( self): 
    527         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     549        self.info( "WARNING: Does not implement method %s()" % __name__) 
    528550#---------------------------------------------------------------- 
    529551    # To init the UI for configuration 
     
    531553    # @param dico Options 
    532554    def _init_ui( self, options=None ): 
    533         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     555        self.info( "WARNING: Does not implement method %s()" % __name__) 
    534556#---------------------------------------------------------------- 
    535557    # To deinit the UI for configuration 
    536558    # @param self instance class 
    537559    def _deinit_ui( self ): 
    538         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     560        self.info( "WARNING: Does not implement method %s()" % __name__) 
    539561#---------------------------------------------------------------- 
    540562    # Provider datas has been updated 
    541563    # @param self instance class 
    542564    def _update_provider_data( self, data ): 
    543         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     565        self.info( "WARNING: Does not implement method %s()" % __name__) 
    544566#---------------------------------------------------------------- 
    545567    # To get configuration widget 
     
    548570    # @return config widget 
    549571    def _get_config_widget( self, data): 
    550         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     572        self.info( "WARNING: Does not implement method %s()" % __name__) 
    551573        return QLabel("No config") 
    552574#---------------------------------------------------------------- 
     
    560582    # @param self instance class 
    561583    def _load_config( self ): 
    562         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     584        self.info( "WARNING: Does not implement method %s()" % __name__) 
    563585#---------------------------------------------------------------- 
    564586    # To save the custom settings 
    565587    # @param self instance class 
    566588    def _save_config( self ): 
    567         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     589        self.info( "WARNING: Does not implement method %s()" % __name__) 
    568590#---------------------------------------------------------------- 
    569591    # To start  
    570592    # @param self                      instance class 
    571593    def _start( self ): 
    572         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     594        self.info( "WARNING: Does not implement method %s()" % __name__) 
    573595#---------------------------------------------------------------- 
    574596    # Config has been changed 
    575597    # @param self instance class 
    576598    def _config_has_changed( self): 
    577         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     599        self.info( "WARNING: Does not implement method %s()" % __name__) 
    578600#---------------------------------------------------------------- 
    579601    # Units have been updated 
     
    581603    # @param name                      Id of the data 
    582604    def _units_updated( self ): 
    583         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     605        self.info( "WARNING: Does not implement method %s()" % __name__) 
    584606#---------------------------------------------------------------- 
    585607    # To receive data issued from requests 
     
    589611    # @param datas                     datas 
    590612    def _data_received( self, destService, srcPlugId, datas): 
    591         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     613        self.info( "WARNING: Does not implement method %s()" % __name__) 
    592614#---------------------------------------------------------------- 
    593615    # Database has been updated for a entry 
     
    595617    # @param name                      Id of the data 
    596618    def _database_updated( self, name): 
    597         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     619        self.info( "WARNING: Does not implement method %s()" % __name__) 
    598620#---------------------------------------------------------------- 
    599621    # To be notified about a selection in a list 
     
    603625    # @param datas                     datas 
    604626    def _selection( self, srcPlugId, list_id, datas): 
    605         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     627        self.info( "WARNING: Does not implement method %s()" % __name__) 
    606628#---------------------------------------------------------------- 
    607629    # To receive data request command 
     
    612634    # @param supInfo                   suplementary info 
    613635    def _data_requested( self, szDataRequest): 
    614         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     636        self.info( "WARNING: Does not implement method %s()" % __name__) 
    615637#---------------------------------------------------------------- 
    616638    # To receive data discard commands 
     
    619641    # @param dataId                    identifier of the requested data 
    620642    def _data_discarded( self, szDataDiscard): 
    621         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     643        self.info( "WARNING: Does not implement method %s()" % __name__) 
    622644#---------------------------------------------------------------- 
    623645    # To execute a command 
     
    626648    # @param cmdData                   associated data 
    627649    def _execute_command( self, cmdId, cmdData): 
    628         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     650        self.info( "WARNING: Does not implement method %s()" % __name__) 
    629651#---------------------------------------------------------------- 
    630652    # To be notified about plug reset 
     
    632654    # @param datas                     datas 
    633655    def _plug_reset( self, datas): 
    634         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     656        self.info( "WARNING: Does not implement method %s()" % __name__) 
    635657#---------------------------------------------------------------- 
    636658    # To implement a process thread 
     
    639661    def _process_thread_entry_point( self): 
    640662        self.processThreadFlag = False 
    641         self.logger.info( "WARNING: Does not implement method %s()" % __name__) 
     663        self.info( "WARNING: Does not implement method %s()" % __name__) 
Note: See TracChangeset for help on using the changeset viewer.