openstack/python-openstackclient
Code Issues Proposed changes

Fix output and error log in server.py

Browse Source 
This patch fixes 2 problems:

1. The '\n' should be in the end of a message,
   not the beginning.

i.e.:
   The original code was:
       sys.stdout.write(_('\nError deleting server'))
   It will make the output look like this:

   [root@tangchen /]# openstack server delete aaa bbb

   Error deleting server
   Error deleting server[root@tangchen /]#

   We change it to:
       sys.stdout.write(_('Error deleting server\n'))
   Then the output will become:

   [root@tangchen /]# openstack server delete aaa bbb
   Error deleting server
   Error deleting server
   [root@tangchen /]#

   which is much better.

2. Record the error in log for those who didn't.

Change-Id: I38b00c2321014757970183205f95f026e20a8090
This commit is contained in:
Tang Chen 2016-05-28 15:46:32 +08:00
parent 9da02d14ea
commit 97162ecd22
1 changed files with 17 additions and 9 deletions

26
openstackclient/compute/v2/server.py

@ -562,7 +562,7 @@ class CreateServer(command.ShowOne):
else:
self.log.error(_('Error creating server: %s'),
parsed_args.server_name)
sys.stdout.write(_('\nError creating server'))
sys.stdout.write(_('Error creating server\n'))
raise SystemExit
details = _prep_server_detail(compute_client, server)
@ -646,7 +646,7 @@ class CreateServerImage(command.ShowOne):
else:
self.log.error(_('Error creating snapshot of server: %s'),
parsed_args.server)
sys.stdout.write(_('\nError creating server snapshot'))
sys.stdout.write(_('Error creating server snapshot\n'))
raise SystemExit
image = _prep_image_detail(image_client, image_id)
@ -688,7 +688,7 @@ class DeleteServer(command.Command):
else:
self.log.error(_('Error deleting server: %s'),
server_obj.id)
sys.stdout.write(_('\nError deleting server'))
sys.stdout.write(_('Error deleting server\n'))
raise SystemExit
@ -1013,7 +1013,9 @@ class MigrateServer(command.Command):
):
sys.stdout.write(_('Complete\n'))
else:
sys.stdout.write(_('\nError migrating server'))
self.log.error(_('Error migrating server: %s'),
server.id)
sys.stdout.write(_('Error migrating server\n'))
raise SystemExit
@ -1085,9 +1087,11 @@ class RebootServer(command.Command):
server.id,
callback=_show_progress,
):
sys.stdout.write(_('\nReboot complete\n'))
sys.stdout.write(_('Complete\n'))
else:
sys.stdout.write(_('\nError rebooting server\n'))
self.log.error(_('Error rebooting server: %s'),
server.id)
sys.stdout.write(_('Error rebooting server\n'))
raise SystemExit
@ -1136,9 +1140,11 @@ class RebuildServer(command.ShowOne):
server.id,
callback=_show_progress,
):
sys.stdout.write(_('\nComplete\n'))
sys.stdout.write(_('Complete\n'))
else:
sys.stdout.write(_('\nError rebuilding server'))
self.log.error(_('Error rebuilding server: %s'),
server.id)
sys.stdout.write(_('Error rebuilding server\n'))
raise SystemExit
details = _prep_server_detail(compute_client, server)
@ -1290,7 +1296,9 @@ class ResizeServer(command.Command):
):
sys.stdout.write(_('Complete\n'))
else:
sys.stdout.write(_('\nError resizing server'))
self.log.error(_('Error resizing server: %s'),
server.id)
sys.stdout.write(_('Error resizing server\n'))
raise SystemExit
elif parsed_args.confirm:
compute_client.servers.confirm_resize(server)