(maint) Catch TokenError from Auth class

This commit is contained in:
Brian Cain 2016-09-24 13:34:28 -07:00
parent c62c1c7083
commit c9e582c24a

View file

@ -66,7 +66,7 @@ class Vmfloaty
pass = password "Enter your password please:", '*' pass = password "Enter your password please:", '*'
begin begin
token = Auth.get_token(verbose, url, user, pass) token = Auth.get_token(verbose, url, user, pass)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -114,7 +114,7 @@ class Vmfloaty
# list active vms # list active vms
begin begin
status = Auth.token_status(verbose, url, token) status = Auth.token_status(verbose, url, token)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -224,7 +224,7 @@ class Vmfloaty
# get vms with token # get vms with token
begin begin
status = Auth.token_status(verbose, url, token) status = Auth.token_status(verbose, url, token)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -373,7 +373,7 @@ class Vmfloaty
pass = password "Enter your password please:", '*' pass = password "Enter your password please:", '*'
begin begin
token = Auth.get_token(verbose, url, user, pass) token = Auth.get_token(verbose, url, user, pass)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -383,7 +383,7 @@ class Vmfloaty
pass = password "Enter your password please:", '*' pass = password "Enter your password please:", '*'
begin begin
result = Auth.delete_token(verbose, url, user, pass, token) result = Auth.delete_token(verbose, url, user, pass, token)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -392,7 +392,7 @@ class Vmfloaty
when "status" when "status"
begin begin
status = Auth.token_status(verbose, url, token) status = Auth.token_status(verbose, url, token)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
exit 1 exit 1
end end
@ -439,7 +439,7 @@ class Vmfloaty
pass = password "Enter your password please:", '*' pass = password "Enter your password please:", '*'
begin begin
token = Auth.get_token(verbose, url, user, pass) token = Auth.get_token(verbose, url, user, pass)
rescue AuthError => e rescue TokenError => e
STDERR.puts e STDERR.puts e
STDERR.puts 'Could not get token...requesting vm without a token anyway...' STDERR.puts 'Could not get token...requesting vm without a token anyway...'
else else