cmdline args for logging in samples (#33)

Author: graebm

samples/basic_discovery.py

@@ -33,26 +33,16 @@
 parser.add_argument('-m', '--mode', action='store', dest='mode', default='both',
                     help='Operation modes: %s'%str(allowed_actions))
 parser.add_argument('-M', '--message', action='store', dest='message', default='Hello World!',
-help='Message to publish')
+                    help='Message to publish')
 parser.add_argument('--region', action='store', dest='region', default='us-east-1')
 parser.add_argument('--max-pub-ops', action='store', dest='max_pub_ops', default=10)
 parser.add_argument('--print-discover-resp-only', action='store_true', dest='print_discover_resp_only', default=False)
-parser.add_argument('-v', '--verbose', action='store', dest='verbosity', default='NoLogs')
+parser.add_argument('-v', '--verbosity', choices=[x.name for x in LogLevel], default=LogLevel.NoLogs.name,
+                    help='Logging level')
 
 args = parser.parse_args()
 
-if args.verbosity.lower() == 'fatal':
-    io.init_logging(LogLevel.Fatal, 'stderr')
-elif args.verbosity.lower() == 'error':
-    io.init_logging(LogLevel.Error, 'stderr')
-elif args.verbosity.lower() == 'warn':
-    io.init_logging(LogLevel.Warn, 'stderr')
-elif args.verbosity.lower() == 'info':
-    io.init_logging(LogLevel.Info, 'stderr')
-elif args.verbosity.lower() == 'debug':
-    io.init_logging(LogLevel.Debug, 'stderr')
-elif args.verbosity.lower() == 'trace':
-    io.init_logging(LogLevel.Trace, 'stderr')
+io.init_logging(getattr(LogLevel, args.verbosity), 'stderr')
 
 event_loop_group = io.EventLoopGroup(1)
 host_resolver = io.DefaultHostResolver(event_loop_group)

samples/jobs.py

@@ -63,6 +63,8 @@
 parser.add_argument('--proxy-host', help="Hostname for proxy to connect to. Note: if you use this feature, " +
     "you will likely need to set --root-ca to the ca for your proxy.")
 parser.add_argument('--proxy-port', type=int, default=8080, help="Port for proxy to connect to.")
+parser.add_argument('--verbosity', choices=[x.name for x in io.LogLevel], default=io.LogLevel.NoLogs.name,
+    help='Logging level')
 
 # Using globals to simplify sample code
 is_sample_done = threading.Event()
@@ -232,6 +234,7 @@ def on_update_job_execution_rejected(rejected):
     # Process input args
     args = parser.parse_args()
     thing_name = args.thing_name
+    io.init_logging(getattr(io.LogLevel, args.verbosity), 'stderr')
 
     # Spin up resources
     event_loop_group = io.EventLoopGroup(1)

samples/pubsub.py

@@ -48,10 +48,14 @@
 parser.add_argument('--proxy-host', help="Hostname for proxy to connect to. Note: if you use this feature, " +
     "you will likely need to set --root-ca to the ca for your proxy.")
 parser.add_argument('--proxy-port', type=int, default=8080, help="Port for proxy to connect to.")
+parser.add_argument('--verbosity', choices=[x.name for x in io.LogLevel], default=io.LogLevel.NoLogs.name,
+    help='Logging level')
 
 # Using globals to simplify sample code
 args = parser.parse_args()
 
+io.init_logging(getattr(io.LogLevel, args.verbosity), 'stderr')
+
 received_count = 0
 received_all_event = threading.Event()
 

samples/shadow.py

@@ -60,6 +60,8 @@
 parser.add_argument('--proxy-host', help="Hostname for proxy to connect to. Note: if you use this feature, " +
     "you will likely need to set --root-ca to the ca for your proxy.")
 parser.add_argument('--proxy-port', type=int, default=8080, help="Port for proxy to connect to.")
+parser.add_argument('--verbosity', choices=[x.name for x in io.LogLevel], default=io.LogLevel.NoLogs.name,
+    help='Logging level')
 
 # Using globals to simplify sample code
 is_sample_done = threading.Event()
@@ -237,6 +239,7 @@ def user_input_thread_fn():
     args = parser.parse_args()
     thing_name = args.thing_name
     shadow_property = args.shadow_property
+    io.init_logging(getattr(io.LogLevel, args.verbosity), 'stderr')
 
     # Spin up resources
     event_loop_group = io.EventLoopGroup(1)

test/test_samples.py

@@ -110,7 +110,7 @@ def test_pubsub(self):
             "--key", config.key_filepath,
             "--client-id", create_client_id(),
             "--count", "1",
-            #"--verbosity", "Trace",
+            "--verbosity", "Trace",
         ]
 
         def stdout_checker(stdout):
@@ -130,7 +130,7 @@ def test_basic_discovery_response_only(self):
             "--cert", config.cert_filepath,
             "--key", config.key_filepath,
             "--thing-name", "aws-sdk-crt-unit-test",
-            "-v", "Trace",
+            "--verbosity", "Trace",
         ]
 
         def stdout_checker(stdout):