summaryrefslogtreecommitdiffstats
path: root/tools/euca-get-ajax-console
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-17 18:54:16 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-17 18:54:16 -0700
commit23efe8d14973a7c94de167562340938ba00d043b (patch)
tree4e383662f4d11763684901e454025ec9c9297543 /tools/euca-get-ajax-console
parent609a912fa8a816c1f47140489dcc1131356cd67c (diff)
parentabc6c82449dfc46a33dcd8190840e51f44b5b930 (diff)
downloadnova-23efe8d14973a7c94de167562340938ba00d043b.tar.gz
nova-23efe8d14973a7c94de167562340938ba00d043b.tar.xz
nova-23efe8d14973a7c94de167562340938ba00d043b.zip
refactored out middleware, now it's a decorator on service.api
Diffstat (limited to 'tools/euca-get-ajax-console')
-rwxr-xr-xtools/euca-get-ajax-console4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console
index 37060e74f..e407dd566 100755
--- a/tools/euca-get-ajax-console
+++ b/tools/euca-get-ajax-console
@@ -35,7 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
import boto
import nova
from boto.ec2.connection import EC2Connection
-from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed
+from euca2ools import Euca2ool, InstanceValidationError, Util
usage_string = """
Retrieves a url to an ajax console terminal
@@ -147,7 +147,7 @@ def main():
try:
euca_conn = euca.make_connection()
- except ConnectionFailed, e:
+ except Exception, e:
print e.message
sys.exit(1)
try: