Connect to the database on init
authorQuentin Smith <quentin@mit.edu>
Sun, 9 Aug 2009 22:45:22 +0000 (18:45 -0400)
committerQuentin Smith <quentin@mit.edu>
Sun, 9 Aug 2009 22:45:22 +0000 (18:45 -0400)
svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2664

code/main.py

index 1739318..5c30714 100755 (executable)
@@ -15,13 +15,6 @@ import urllib
 import socket
 import cherrypy
 from StringIO import StringIO
-from view import View
-
-class InvirtWeb(View):
-    @cherrypy.expose
-    def helloworld(self):
-        return "Hello world!"
-
 def revertStandardError():
     """Move stderr to stdout, and return the contents of the old stderr."""
     errio = sys.stderr
@@ -52,6 +45,17 @@ from invirt.database import Machine, CDROM, session, connect, MachineAccess, Typ
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
 
+from view import View
+
+class InvirtWeb(View):
+    def __init__(self):
+        super(self.__class__,self).__init__()
+        connect()
+
+    @cherrypy.expose
+    def helloworld(self):
+        return "Hello world!"
+
 def pathSplit(path):
     if path.startswith('/'):
         path = path[1:]