[haizea-commit] r481 - trunk/src/haizea/resourcemanager

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2008-08-30 14:45:18 -0500 (Sat, 30 Aug 2008)
New Revision: 481

Modified:
   trunk/src/haizea/resourcemanager/datastruct.py
   trunk/src/haizea/resourcemanager/rm.py
Log:
Minor logging fixes

Modified: trunk/src/haizea/resourcemanager/datastruct.py
===================================================================
--- trunk/src/haizea/resourcemanager/datastruct.py	2008-08-30 19:44:39 UTC (rev 480)
+++ trunk/src/haizea/resourcemanager/datastruct.py	2008-08-30 19:45:18 UTC (rev 481)
@@ -88,7 +88,7 @@
         
         self.logger = logging.getLogger("LEASES")
         
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         self.logger.log(loglevel, "Lease ID       : %i" % self.id)
         self.logger.log(loglevel, "Submission time: %s" % self.submit_time)
         self.logger.log(loglevel, "Duration       : %s" % self.duration)
@@ -100,7 +100,7 @@
         self.logger.log(loglevel, "VM image map   : %s" % pretty_nodemap(self.vmimagemap))
         self.logger.log(loglevel, "Mem image map  : %s" % pretty_nodemap(self.memimagemap))
 
-    def print_rrs(self, loglevel="VDEBUG"):
+    def print_rrs(self, loglevel=LOGLEVEL_VDEBUG):
         self.logger.log(loglevel, "RESOURCE RESERVATIONS")
         self.logger.log(loglevel, "~~~~~~~~~~~~~~~~~~~~~")
         for r in self.rr:
@@ -244,6 +244,7 @@
         l["preemptible"] = self.preemptible
         l["state"] = self.state
         l["rr"] = [rr.xmlrpc_marshall() for rr in self.rr]
+                
         return l
         
         
@@ -258,7 +259,7 @@
         LeaseBase.__init__(self, submit_time, start, duration, diskimage_id,
                            diskimage_size, numnodes, resreq, preemptible)
         
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         self.logger.log(loglevel, "__________________________________________________")
         LeaseBase.print_contents(self, loglevel)
         self.logger.log(loglevel, "Type           : AR")
@@ -321,7 +322,7 @@
         LeaseBase.__init__(self, submit_time, start, duration, diskimage_id,
                            diskimage_size, numnodes, resreq, preemptible)
 
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         self.logger.log(loglevel, "__________________________________________________")
         LeaseBase.print_contents(self, loglevel)
         self.logger.log(loglevel, "Type           : IMMEDIATE")
@@ -351,7 +352,7 @@
         self.resources_in_pnode = res
         self.logger = logging.getLogger("LEASES")
                         
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         self.logger.log(loglevel, "Start          : %s" % self.start)
         self.logger.log(loglevel, "End            : %s" % self.end)
         self.logger.log(loglevel, "State          : %s" % rstate_str(self.state))
@@ -383,7 +384,7 @@
         else:
             self.prematureend = None 
 
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         ResourceReservationBase.print_contents(self, loglevel)
         if self.prematureend != None:
             self.logger.log(loglevel, "Premature end  : %s" % self.prematureend)
@@ -406,7 +407,7 @@
         ResourceReservationBase.__init__(self, lease, start, end, res)
         self.nodes = nodes
 
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         ResourceReservationBase.print_contents(self, loglevel)
         self.logger.log(loglevel, "Type           : SUSPEND")
         self.logger.log(loglevel, "Nodes          : %s" % pretty_nodemap(self.nodes))
@@ -428,7 +429,7 @@
         ResourceReservationBase.__init__(self, lease, start, end, res)
         self.nodes = nodes
 
-    def print_contents(self, loglevel="VDEBUG"):
+    def print_contents(self, loglevel=LOGLEVEL_VDEBUG):
         ResourceReservationBase.print_contents(self, loglevel)
         self.logger.log(loglevel, "Type           : RESUME")
         self.logger.log(loglevel, "Nodes          : %s" % pretty_nodemap(self.nodes))

Modified: trunk/src/haizea/resourcemanager/rm.py
===================================================================
--- trunk/src/haizea/resourcemanager/rm.py	2008-08-30 19:44:39 UTC (rev 480)
+++ trunk/src/haizea/resourcemanager/rm.py	2008-08-30 19:45:18 UTC (rev 481)
@@ -128,15 +128,18 @@
         from haizea.resourcemanager.log import HaizeaLogger
         logger = logging.getLogger("")
         if self.daemon:
-            handler = logging.FileHandler(file)
+            handler = logging.FileHandler(self.config.get("logfile"))
         else:
             handler = logging.StreamHandler()
-        formatter = logging.Formatter('[%(haizeatime)s] %(name)-15s  - %(message)s')
+        formatter = logging.Formatter('[%(haizeatime)s] %(name)-7s %(message)s')
         handler.setFormatter(formatter)
         logger.addHandler(handler)
         level = logging.getLevelName(self.config.get("loglevel"))
         logger.setLevel(level)
         logging.setLoggerClass(HaizeaLogger)
+        #if self.daemon:
+        #    logger.info("Logging to file %s" % self.config.get("logfile"))
+
         
     def daemonize(self):
         """Daemonizes the Haizea process.
@@ -282,7 +285,7 @@
         except Exception, msg:
             # Exit if something goes horribly wrong
             self.logger.error("Exception when processing reservations. Dumping state..." )
-            self.print_stats("ERROR", verbose=True)
+            self.print_stats(logging.getLevelName("ERROR"), verbose=True)
             raise      
 
         
@@ -703,7 +706,7 @@
 if __name__ == "__main__":
     from haizea.resourcemanager.configfile import HaizeaConfig
     from haizea.common.config import ConfigException
-    CONFIGFILE = "../../../etc/sample.conf"
+    CONFIGFILE = "../../../etc/sample_trace.conf"
     try:
         CONFIG = HaizeaConfig.from_file(CONFIGFILE)
     except ConfigException, msg: