Changeset 1013 for trunk/packages/sipb-xen-www/code/main.py

Timestamp:

Oct 3, 2008, 7:26:43 PM (16 years ago)

Author:

broder

Message:

Update web code to for SQLAlchemy 0.4

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (4 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -362 +362 @@
     """
     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()])
@@ -381 +381 @@
                 olddisk[disk.guest_device_name] = disksize
                 disk.size = disksize
-                ctx.current.save(disk)
+                session.save_or_update(disk)
 
         update_acl = False
@@ -397 +397 @@
             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:
@@ -654 +654 @@
              errorMessage=str(err), stderr=emsg, traceback=traceback)
     details = templates.error_raw(searchList=[d])
-    if username not in config.web.errormail_exclude:
+    if False: #username not in config.web.errormail_exclude:
         send_error_mail('xvm error on %s for %s: %s' % (op, username, err),
                         details)