X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/951d9d34cc178bf92375e352e7931d74e55eb668..4dcbcf9d402566f7b02241c7ddd4e4f34ee0ca6b:/code/main.py

diff --git a/code/main.py b/code/main.py
index dd36b1b..e4727a8 100755
--- a/code/main.py
+++ b/code/main.py
@@ -40,7 +40,7 @@ from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
 from invirt import database
-from invirt.database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
+from invirt.database import Machine, CDROM, session, connect, MachineAccess, Type, Autoinstall
 from invirt.config import structs as config
 
 def pathSplit(path):
@@ -361,7 +361,7 @@ def modifyDict(username, state, fields):
     Return a list of local variables for modify.tmpl.
     """
     olddisk = {}
-    transaction = ctx.current.create_transaction()
+    session.begin()
     try:
         kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name description memory vmtype disksize'.split()])
         validate = validation.Validate(username, state, **kws)
@@ -380,7 +380,7 @@ def modifyDict(username, state, fields):
             if disk.size != disksize:
                 olddisk[disk.guest_device_name] = disksize
                 disk.size = disksize
-                ctx.current.save(disk)
+                session.save_or_update(disk)
 
         update_acl = False
         if hasattr(validate, 'owner') and validate.owner != machine.owner:
@@ -396,13 +396,13 @@ def modifyDict(username, state, fields):
         if hasattr(validate, 'contact'):
             machine.contact = validate.contact
 
-        ctx.current.save(machine)
+        session.save_or_update(machine)
         if update_acl:
             print >> sys.stderr, machine, machine.administrator
             cache_acls.refreshMachine(machine)
-        transaction.commit()
+        session.commit()
     except:
-        transaction.rollback()
+        session.rollback()
         raise
     for diskname in olddisk:
         controls.resizeDisk(oldname, diskname, str(olddisk[diskname]))
@@ -653,7 +653,8 @@ def show_error(op, username, fields, err, emsg, traceback):
     d = dict(op=op, user=username, fields=fields,
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])
-    if username not in config.web.errormail_exclude:
+    exclude = config.web.errormail_exclude
+    if username not in exclude and '*' not in exclude:
         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)
     d['details'] = details