fix: allow setting RUST_LOG manually (#56)

* fix: allow setting RUST_LOG manually * fixup * fix --------- Co-authored-by: Asmir Avdicevic <[email protected]>
n0-computer · Jun 24, 2024 · 8661a7d · 8661a7d
1 parent e6155a1
commit 8661a7d
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/netsim/main.py b/netsim/main.py
@@ -36,7 +36,7 @@ def logs_on_error(nodes, prefix, code=1, message=None):
     if message:
         print('[ERROR] Message:', message)
 
-def run(nodes, prefix, args, debug=False, full_debug=False, visualize=False):
+def run(nodes, prefix, args, debug=False, visualize=False):
     integration = args.integration
     topo = StarTopo(nodes=nodes)
     net = Mininet(topo = topo, waitConnected=True, link=TCLink)
@@ -60,11 +60,12 @@ def run(nodes, prefix, args, debug=False, full_debug=False, visualize=False):
 
     env_vars = os.environ.copy()
     if debug:
-        # reduce logging, track only those of interest
-        # magicsock::endpoint required for iroh integration tests
-        env_vars['RUST_LOG'] = 'error,iroh_net::magicsock::node_map::endpoint=trace'
-        if full_debug:
-            env_vars['RUST_LOG'] = 'debug'
+        env_vars['RUST_LOG'] = 'debug'
+    if not 'RUST_LOG' in env_vars:
+        env_vars['RUST_LOG'] = 'warn'
+    # magicsock::endpoint required for iroh integration tests
+    env_vars['RUST_LOG'] += ",iroh_net::magicsock::node_map::endpoint=trace"
+
 
     p_box = []
     p_short_box = []
@@ -204,8 +205,6 @@ def cleanup_tmp_dirs(temp_dirs):
     else:
         paths.append(args.cfg)
 
-    full_debug = args.debug
-
     for path in paths:    
         config_f = open(path, 'r')
         config = json.load(config_f)
@@ -224,7 +223,7 @@ def cleanup_tmp_dirs(temp_dirs):
             #     viz = case['visualize']
             print('running "%s"...' % prefix)
             if not args.r:
-                run(nodes, prefix, args, True, full_debug, viz)
+                run(nodes, prefix, args, args.debug, viz)
             stats_parser(nodes, prefix)
             integration_parser(nodes, prefix)
             if viz:
@@ -234,4 +233,4 @@ def cleanup_tmp_dirs(temp_dirs):
                     'topo': 'logs/' + prefix + '.topo.json',
                     'output': 'viz/' + prefix + '.svg'
                 }
-                run_viz(viz_args)
+                run_viz(viz_args)