clean up message template and logging. syntax errors.

[nodemanager.git] / bwmon.py

diff --git a/bwmon.py b/bwmon.py
index 59f6234..8f04808 100644 (file)
--- a/bwmon.py
+++ b/bwmon.py
@@ -187,9 +187,9 @@ class Slice:
         self.Maxi2Rate = default_Maxi2Rate
         self.Mini2Rate = bwlimit.bwmin / 1000
         self.MaxKByte = default_MaxKByte
-        self.ThreshKByte = (.8 * self.MaxKByte)
+        self.ThreshKByte = int(.8 * self.MaxKByte)
         self.Maxi2KByte = default_Maxi2KByte
-        self.Threshi2KByte = (.8 * self.Maxi2KByte)
+        self.Threshi2KByte = int(.8 * self.Maxi2KByte)
         self.Share = default_Share
         self.Sharei2 = default_Share
         self.emailed = False
@@ -330,10 +330,10 @@ class Slice:
             params['class'] = "high bandwidth"
             params['bytes'] = format_bytes(usedi2bytes - self.i2bytes)
             params['limit'] = format_bytes(self.Maxi2KByte * 1024)
-            params['new_maxexemptrate'] = bwlimit.format_tc_rate(new_maxi2rate)
+            params['new_maxrate'] = bwlimit.format_tc_rate(new_maxexemptrate)
  
             message += template % params
-            logger.log("bwmon:   ** %(slice)s %(class)s capped at %(new_maxrate)s/s " % params)
+            logger.log("bwmon:   ** %(slice)s %(class)s capped at %(new_maxexemptrate)s/s " % params)
        
         # Notify slice
         if message and self.emailed == False:
@@ -400,7 +400,7 @@ class Slice:
 
         # Notify slice
         if self.capped == True and self.emailed == False:
-            self.notify(newmaxrate, newmaxexemptrate, usedbytes, usedi2bytes)
+            self.notify(new_maxrate, new_maxi2rate, usedbytes, usedi2bytes)
 
 
 def gethtbs(root_xid, default_xid):