Changeset 841 for trunk/Monitoring/smon

Timestamp:

03/28/13 11:44:36 (11 years ago)

Author:

jripsl

Message:

• add static class initialisation function.

Location:

trunk/Monitoring/smon

Files:

• dao.py (modified) (2 diffs)
• db.py (modified) (2 diffs)
• logger.py (modified) (3 diffs)
• smon.py (modified) (1 diff)

trunk/Monitoring/smon/dao.py

@@ -18 +18 @@
 
         @classmethod
-        def getMessageFromResultSet(self,rs):
+        def get_message_from_resultset(self,rs):
                 return Message(id=rs[0],name=rs[1],timestamp=rs[2],nested_level=rs[3],simulation_id=rs[4])
 
         @classmethod
-        def addMessage(self,message,con):
+        def add_message(self,message,con):
                 c = con.cursor()
 
@@ -32 +32 @@
 
         @classmethod
-        def getMessages(self):
+        def get_messages(self):
                 messages=[]
 

trunk/Monitoring/smon/db.py

@@ -40 +40 @@
 
                 # open connection
-                self._conn=sqlite3.connect(self.getDBName(),l__timeout)
+                self._conn=sqlite3.connect(self.get_DB_name(),l__timeout)
                 self._conn.row_factory=sqlite3.Row # this is for "by name" colums indexing
 
@@ -46 +46 @@
 
         @classmethod
-        def getDBName(self):
+        def get_DB_name(self):
                 return SMON.dbfile
 

trunk/Monitoring/smon/logger.py

@@ -14 +14 @@
 import logging
 
-def createLogger(name,fullpath_filename):
+def create_logger(name,fullpath_filename):
 
         # new logger instance
@@ -38 +38 @@
 
         @classmethod
-        def logAndStdout(cls,errcode,errmsg):
+        def log_and_stdout(cls,errcode,errmsg):
                 cls.stdout(errcode,errmsg)
                 cls.log(errcode,errmsg)
@@ -49 +49 @@
         def log(cls,errcode,errmsg):
                 cls._logger.info(errmsg,extra={'code' : errcode})
-
-        @classmethod
-        def getLogger(cls):
-                return cls._logger
-
-        @classmethod
-        def setLogger(cls,logger):
-                cls._logger=logger

trunk/Monitoring/smon/smon.py

@@ -15 +15 @@
 
         @classmethod
-        def init(self):
-                self.smon_home=os.environ['SMON_HOME']
-                self.log_dir="%s/log"%self.smon_home
-                self.dbfile="%s/db/smon.db"%self.smon_home
+        def init(cls):
+                cls.smon_home=os.environ['SMON_HOME']
+                cls.log_dir="%s/log"%cls.smon_home
+                cls.dbfile="%s/db/smon.db"%cls.smon_home
+
+        @classmethod
+        def init_singleton(cls):
+                pass
+
+        @classmethod
+        def free_singleton(cls):
+                pass