From: Quentin Smith <quentin@mit.edu>
Date: Sun, 9 Aug 2009 22:45:22 +0000 (-0400)
Subject: Connect to the database on init
X-Git-Tag: 0.1.0^2~71
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/aea62528d39fcdeaf94b440ef3e14992cb79f704

Connect to the database on init

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2664
---

diff --git a/code/main.py b/code/main.py
index 1739318..5c30714 100755
--- a/code/main.py
+++ b/code/main.py
@@ -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:]