Add real caching to remconffs

[invirt/packages/invirt-remote.git] / files / usr / sbin / invirt-remconffs

diff --git a/files/usr/sbin/invirt-remconffs b/files/usr/sbin/invirt-remconffs
index 384c791..d023749 100755 (executable)
--- a/files/usr/sbin/invirt-remconffs
+++ b/files/usr/sbin/invirt-remconffs
@@ -18,7 +18,7 @@ class RemConfFS(routefs.RouteFS):
        |   ...
        |   `-- machinen
        `-- conf
        |   ...
        |   `-- machinen
        `-- conf

-        
+       

        The machine list and the acls are drawn from a database.
        """
        
        The machine list and the acls are drawn from a database.
        """
        

@@ -27,33 +27,40 @@ class RemConfFS(routefs.RouteFS):
                the user who mounts the filesystem (i.e. root)
                """
                super(RemConfFS, self).__init__(*args, **kw)
                the user who mounts the filesystem (i.e. root)
                """
                super(RemConfFS, self).__init__(*args, **kw)

-               self.lasttime = time()
+               self.lasttime = 0

                self.fuse_args.add("allow_other", True)
                
                openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)
                
                syslog(LOG_DEBUG, 'Init complete.')
                self.fuse_args.add("allow_other", True)
                
                openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)
                
                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
                """
        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',
                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
                """
        def getconf(self, **kw):
                """Build the master conf file, with all machines
                """

@@ -65,11 +72,9 @@ class RemConfFS(routefs.RouteFS):
        def getmachines(self, **kw):
                """Get the list of VMs in the database, clearing the cache if it's 
                older than 15 seconds"""
        def getmachines(self, **kw):
                """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
                realm if none is specified
        def userToPrinc(self, user):
                """Convert Kerberos v4-style names to v5-style and append a default
                realm if none is specified

@@ -84,4 +89,4 @@ class RemConfFS(routefs.RouteFS):
 
 if __name__ == '__main__':
        database.connect()
 
 if __name__ == '__main__':
        database.connect()

-        routefs.main(RemConfFS)
+       routefs.main(RemConfFS)