Changeset 192

Timestamp:

07/31/12 00:21:01 (12 years ago)

Author:

atzm

Message:

• adjust ctl outputs

File:

• etherws/trunk/etherws.py (modified) (2 diffs)

etherws/trunk/etherws.py

@@ -521 +521 @@
         except Exception as e:
             traceback.print_exc()
-            self.finish({'result': None, 'error': {'msg': str(e)}, 'id': id_})
+            msg = '%s: %s' % (e.__class__.__name__, str(e))
+            self.finish({'result': None, 'error': {'message': msg}, 'id': id_})
 
     def handle_listPort(self, params):
@@ -738 +739 @@
             }
         }]
-        res = request(args, 'addPort', params)
-        print(yaml.safe_dump(res))
+        return request(args, 'addPort', params)
 
     def handle_ctl_shutport(args):
         if args.port <= 0:
             raise ValueError('invalid port: %d' % args.port)
-        res = request(args, 'shutPort', [{'port': args.port, 'shut': args.no}])
-        print(yaml.safe_dump(res))
+        params = [{'port': args.port, 'shut': args.no}]
+        return request(args, 'shutPort', params)
 
     def handle_ctl_delport(args):
         if args.port <= 0:
             raise ValueError('invalid port: %d' % args.port)
-        res = request(args, 'delPort', [{'port': args.port}])
-        print(yaml.safe_dump(res))
+        params = [{'port': args.port}]
+        return request(args, 'delPort', params)
 
     def handle_ctl_listport(args):
-        res = request(args, 'listPort', [])
-        print(yaml.safe_dump(res))
-
-    locals()['handle_ctl_' + args.control_method](args)
+        return request(args, 'listPort', [])
+
+    res = locals()['handle_ctl_' + args.control_method](args)
+
+    if res['error']:
+        print(res['error']['message'])
+    else:
+        print(yaml.safe_dump(res['result']['portlist']).strip())