From: Evan Broder Date: Mon, 28 Dec 2009 19:03:33 +0000 (-0500) Subject: Add more user-friendly error handling for common errors, so they don't X-Git-Tag: 0.1.5~14 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/fdda3852e46b9fb9bde623d6dbd4d55752fcbf74?ds=sidebyside Add more user-friendly error handling for common errors, so they don't send us e-mail. (LP: #307296) svn path=/trunk/packages/invirt-web/; revision=2803 --- diff --git a/code/controls.py b/code/controls.py index bbc9f8c..2a86a89 100644 --- a/code/controls.py +++ b/code/controls.py @@ -73,6 +73,19 @@ def bootMachine(machine, cdtype): if 'already running' in err: raise InvalidInput('action', 'create', 'VM %s is already on' % machine.name) + elif 'I need' in err and 'but dom0_min_mem is' in err: + raise InvalidInput('action', 'create', + "We're really sorry, but our servers don't have enough capacity to create your VM right now. Try creating a VM with less RAM, or shutting down another VM of yours. Feel free to ask %s if you would like to know when we plan to have more resources." % (config.contact)) + elif ('Booting VMs is temporarily disabled for maintenance, sorry' in err or + 'LVM operations are temporarily disabled for maintenance, sorry' in err): + raise InvalidInput('action', 'create', + err) + elif "Boot loader didn't return any data!" in err: + raise InvalidInput('action', 'create', + "The ParaVM bootloader was unable to find an operating system to boot. Do you have GRUB configured correctly?") + elif 'xc_dom_find_loader: no loader found' in err: + raise InvalidInput('action', 'create', + "The ParaVM bootloader was unable to boot the kernel you have configured. Are you sure this kernel is capable of running as a Xen ParaVM guest?") elif err: raise CodeError('"%s" on "control %s create %s' % (err, machine.name, cdtype)) diff --git a/debian/changelog b/debian/changelog index f33fb00..acb4e06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-web (0.1.3) unstable; urgency=low + + * Add some more user-friendly error handling for common errors. (LP: + #307296) + + -- Evan Broder Mon, 28 Dec 2009 13:03:00 -0600 + invirt-web (0.1.2) unstable; urgency=low * Do some quick config cleanup.