Changeset 1265

Timestamp:

01/03/07 14:46:54 (6 years ago)

Author:

mglb1

Message:

• Fix execution of customer state update routine
• Increase logging verbosity for plan changes

File:

• ccsd/private/modules/ccs_rurallink_billing.py (modified) (5 diffs)

ccsd/private/modules/ccs_rurallink_billing.py

@@ -30 +30 @@
     session = getSession(ADMIN_SESSION_ID)
 
-    sql = "SELECT FROM update_customer_state()"
+    sql = "SELECT update_customer_state()"
 
-    session.execute(sql, ())
+    session.query(sql, ())
 
 def checkUsage():
@@ -40 +40 @@
     """
     #Update the customer_states before checking data used.
+    log_info("Updating RADIUS usage details")
     updateRadius()
     
     session = getSession(ADMIN_SESSION_ID)
     
-    sql = "SELECT DISTINCT * FROM customer_state WHERE used_mb > cap_at_mb"
+    sql = "SELECT cs.*, c.username FROM customer_state cs, customers c WHERE " \
+            "cs.contact_id=c.contact_id AND cs.used_mb > cs.cap_at_mb"
 
     res = session.query(sql, ())
@@ -111 +113 @@
     session = getSession(ADMIN_SESSION_ID)
 
-    sql = "SELECT cap_action, cap_param, cap_price FROM billing_plan" \
-        " WHERE plan_id=%s"
+    sql = "SELECT cap_action, cap_param, cap_price, description FROM " \
+            "billing_plan WHERE plan_id=%s"
 
     res = session.query(sql, (customer["plan_id"]))
@@ -119 +121 @@
         sql = "UPDATE customer_state SET radius_plan=%s WHERE contact_id=%s"
         session.execute(sql,(res[0]["cap_param"], customer["contact_id"]))
+        log_info("Moved '%s' to plan %s (throttled)" % \
+                (customer["username"], res[0]["description"]))
     elif res[0]["cap_action"] == "purchase":
         cap_at_mb = customer["cap_at_mb"]
@@ -136 +140 @@
             session.execute(sql, (customer["contact_id"], res[0]["cap_price"]))
             cap_at_mb += res[0]["cap_param"]
-    
+            log_info("Purchased %sMB block for '%s'. New cap: %sMB." % \
+                (res[0]["cap_param"], customer["username"], cap_at_mb))
+
 def generateInvoice(contact_id):
     """