X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/892175e9d1c88d7db0c6bcc28e3ee4598ea035a4..cabbf7ab8e35de060f6f4e3f75670558ad25d9b5:/code/webcommon.py

diff --git a/code/webcommon.py b/code/webcommon.py
index 58d9333..5911787 100644
--- a/code/webcommon.py
+++ b/code/webcommon.py
@@ -36,13 +36,13 @@ def cachedproperty(func):
             return value
     return property(getter)
 
-class Global(object):
-    """Global state of the system, to avoid duplicate remctls to get state"""
+class State(object):
+    """State for a request"""
     def __init__(self, user):
-        self.user = user
+        self.username = user
 
     machines = cachedproperty(lambda self:
-                                  Machine.query().join('acl').select_by(user=self.user))
+                                  Machine.query().join('acl').select_by(user=self.username))
     xmlist_raw = cachedproperty(lambda self: controls.getList())
     xmlist = cachedproperty(lambda self:
                                 dict((m, self.xmlist_raw[m.name])
@@ -55,4 +55,4 @@ class Global(object):
             if attr.startswith('__cache_'):
                 delattr(self, attr)
 
-g = Global(None)
+state = State(None)