more debug

Author: francesconazzaro

cads_broker/database.py

@@ -527,12 +527,14 @@ def user_last_completed_request(
         user_uid, max_time_datetime
     )
 
-    return int(
+    value = int(
         (
             datetime.datetime.now()
             - max(user_last_finished_at_datetime, max_time_datetime)
         ).total_seconds()
     )
+    print("FINISHED AT", value)
+    return value
 
 
 def user_resource_used(
@@ -552,6 +554,7 @@ def user_resource_used(
         )
         QOS_FUNCTIONS_CACHE["users_resources"] = users_resources
 
+    print("--------RESOURCE", users_resources.get(user_uid, 0))
     return users_resources.get(user_uid, 0)
 
 

cads_broker/qos/QoS.py

@@ -180,11 +180,9 @@ def dynamic_priority(self, request):
     def priority(self, request):
         """Compute the priority of a request."""
         # The priority of a request increases with time
-        starting_priority = self._properties(request).starting_priority
-        dynamic_priority = self.dynamic_priority(request)
-        print("starting priority: ", starting_priority)
-        print("dynamic priority: ", dynamic_priority)
-        return starting_priority + dynamic_priority
+        return self._properties(
+            request
+        ).starting_priority + self.dynamic_priority(request)
 
     def dump(self, out=print):
         self.rules.dump(out)