mi/event: improve logging in tools

Author: razvancrainea

opensips/event/__main__.py

@@ -112,7 +112,7 @@ def main():
                         timeout=0.1)
     else:
         if not args.bash_complete:
-            print(f'Unknown type: {args.type}')
+            print(f'ERROR: unknown type: {args.type}')
         sys.exit(1)
 
     if args.bash_complete is not None:
@@ -144,7 +144,7 @@ def main():
             sys.exit(1)
 
     if args.event is None:
-        print('Event name is required')
+        print(f'ERROR: unknown type: {args.type}')
         sys.exit(1)
 
     hdl = OpenSIPSEventHandler(mi, args.transport,
@@ -160,7 +160,7 @@ def event_handler(message):
         try:
             print(json.dumps(message, indent=4))
         except json.JSONDecodeError as e:
-            print(f"Failed to decode JSON: {e}")
+            print(f"ERROR: failed to decode JSON: {e}")
 
     ev = None
 
@@ -179,7 +179,7 @@ def timer(*_):
     try:
         ev = hdl.subscribe(args.event, event_handler, args.expire)
     except OpenSIPSEventException as e:
-        print(e)
+        print("ERROR:", e)
         sys.exit(1)
 
     while True:

opensips/mi/__main__.py

@@ -135,29 +135,26 @@ def main():
             sys.exit(1)
 
     if args.stats:
-        print('Using get_statistics! Be careful not to use '
-              'command after -s/--stats.')
         args.command = 'get_statistics'
 
         if args.json:
-            print('Cannot use -s/--stats with -j/--json!')
+            print('ERROR: cannot use -s/--stats with -j/--json!')
             sys.exit(1)
 
         args.parameters = {'statistics': args.stats}
     else:
         if args.json:
             try:
                 args.parameters = json.loads(args.json)
-                print(args.parameters)
             except json.JSONDecodeError as e:
-                print('Invalid JSON: ', e)
+                print('ERROR: invalid JSON: ', e)
                 sys.exit(1)
 
     try:
         response = mi.execute(args.command, args.parameters)
         print(json.dumps(response, indent=4))
     except OpenSIPSMIException as e:
-        print('Error: ', e)
+        print('ERROR: ', e)
         sys.exit(1)