[haizea-commit] r772 - branches/1.1/src/haizea/pluggable/accounting

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

Author: borja
Date: 2010-01-15 14:33:44 -0600 (Fri, 15 Jan 2010)
New Revision: 772

Modified:
   branches/1.1/src/haizea/pluggable/accounting/leases.py
Log:
Fixed bug: rejected price wasn't being recorded in some cases.

Modified: branches/1.1/src/haizea/pluggable/accounting/leases.py
===================================================================
--- branches/1.1/src/haizea/pluggable/accounting/leases.py	2010-01-15 11:35:00 UTC (rev 771)
+++ branches/1.1/src/haizea/pluggable/accounting/leases.py	2010-01-15 20:33:44 UTC (rev 772)
@@ -307,18 +307,18 @@
             self.accounting.incr_counter(PriceProbe.COUNTER_REVENUE, lease.id, lease.price)
             self.accounting.set_lease_stat(PriceProbe.LEASE_STAT_PRICE, lease.id, lease.price)
 
-        if lease.extras.has_key("rate") and lease.extras.has_key("simul_userrate"):
+        if lease.extras.has_key("simul_userrate"):
             user_rate = float(lease.extras["simul_userrate"])
             user_price = get_policy().pricing.get_base_price(lease, user_rate)
             
             if lease.get_state() == Lease.STATE_DONE:
                 surcharge = lease.price - get_policy().pricing.get_base_price(lease, lease.extras["rate"])
-                self.accounting.incr_counter(PriceProbe.STAT_MISSED_REVENUE_UNDERCHARGE, lease.id, user_price - lease.price)
-                self.accounting.incr_counter(PriceProbe.STAT_SURCHARGE, lease.id, surcharge)
+                self.accounting.incr_counter(PriceProbe.COUNTER_MISSED_REVENUE_UNDERCHARGE, lease.id, user_price - lease.price)
+                self.accounting.incr_counter(PriceProbe.COUNTER_SURCHARGE, lease.id, surcharge)
             elif lease.get_state() == Lease.STATE_REJECTED:
-                self.accounting.incr_counter(PriceProbe.STAT_MISSED_REVENUE_REJECT, lease.id, user_price)
+                self.accounting.incr_counter(PriceProbe.COUNTER_MISSED_REVENUE_REJECT, lease.id, user_price)
             elif lease.get_state() == Lease.STATE_REJECTED_BY_USER:
-                self.accounting.incr_counter(PriceProbe.STAT_MISSED_REVENUE_REJECT_BY_USER, lease.id, user_price)
+                self.accounting.incr_counter(PriceProbe.COUNTER_MISSED_REVENUE_REJECT_BY_USER, lease.id, user_price)
             
                 
 class DeadlineProbe(AccountingProbe):