Index: trunk/packages/invirt-remote-server/debian/changelog
===================================================================
--- trunk/packages/invirt-remote-server/debian/changelog	(revision 1695)
+++ trunk/packages/invirt-remote-server/debian/changelog	(revision 1697)
@@ -1,2 +1,8 @@
+invirt-remote-server (0.1.0) unstable; urgency=low
+
+  * Add real caching to remconffs
+
+ -- Evan Broder <broder@mit.edu>  Mon, 17 Nov 2008 13:05:32 -0500
+
 invirt-remote-server (0.0.18) unstable; urgency=low
 
Index: trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs
===================================================================
--- trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs	(revision 1695)
+++ trunk/packages/invirt-remote-server/files/usr/sbin/invirt-remconffs	(revision 1697)
@@ -19,5 +19,5 @@
 	|   `-- machinen
 	`-- conf
-        
+	
 	The machine list and the acls are drawn from a database.
 	"""
@@ -28,5 +28,5 @@
 		"""
 		super(RemConfFS, self).__init__(*args, **kw)
-		self.lasttime = time()
+		self.lasttime = 0
 		self.fuse_args.add("allow_other", True)
 		
@@ -34,25 +34,32 @@
 		
 		syslog(LOG_DEBUG, 'Init complete.')
-        
-        def make_map(self):
-                m = Mapper()
-                m.connect('', controller='getroot')
-                m.connect('acl', controller='getmachines')
-                m.connect('acl/:machine', controller='getacl')
-                m.connect('conf', controller='getconf')
-                return m
-        
-        def getroot(self, **kw):
-                return ['acl', 'conf']
-        
+	
+	def make_map(self):
+		m = Mapper()
+		m.connect('', controller='getroot')
+		m.connect('acl', controller='getmachines')
+		m.connect('acl/:machine', controller='getacl')
+		m.connect('conf', controller='getconf')
+		return m
+	
+	def recache(self):
+		if time() - self.lasttime > 15:
+			self.lasttime = time()
+			database.clear_cache()
+			self.machines = dict((machine.name, machine) for machine in database.session.query(database.Machine).all())
+	
+	def getroot(self, **kw):
+		return ['acl', 'conf']
+	
 	def getacl(self, machine, **kw):
 		"""Build the ACL file for a machine
 		"""
-		machine = database.Machine.query().filter_by(name=machine).one()
+		self.recache()
+		machine = self.machines[machine]
 		users = [acl.user for acl in machine.acl]
 		return "\n".join(map(self.userToPrinc, users)
 				 + ['include /etc/remctl/acl/web',
-				    ''])
-        
+					''])
+	
 	def getconf(self, **kw):
 		"""Build the master conf file, with all machines
@@ -66,9 +73,7 @@
 		"""Get the list of VMs in the database, clearing the cache if it's 
 		older than 15 seconds"""
-		if time() - self.lasttime > 15:
-			self.lasttime = time()
-			database.clear_cache()
-		return [machine.name for machine in database.session.query(database.Machine).all()]
-        
+		self.recache()
+		return self.machines.keys()
+	
 	def userToPrinc(self, user):
 		"""Convert Kerberos v4-style names to v5-style and append a default
@@ -85,3 +90,3 @@
 if __name__ == '__main__':
 	database.connect()
-        routefs.main(RemConfFS)
+	routefs.main(RemConfFS)