From 624617d8e1418d0ad0a04139f7a8b2dab41fd3aa Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Thu, 11 Mar 2021 21:44:10 -0500
Subject: [PATCH] Don't run brokerds in debug mode by default

---
 piker/data/__init__.py | 26 ++++++++++++++++++--------
 piker/ui/cli.py        |  4 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/piker/data/__init__.py b/piker/data/__init__.py
index c52e5e6c..b9c09e1c 100644
--- a/piker/data/__init__.py
+++ b/piker/data/__init__.py
@@ -87,9 +87,11 @@ _data_mods = [
 @asynccontextmanager
 async def maybe_spawn_brokerd(
     brokername: str,
-    sleep: float = 0.5,
     loglevel: Optional[str] = None,
-    **tractor_kwargs,
+
+    # XXX: you should pretty much never want debug mode
+    # for data daemons when running in production.
+    debug_mode: bool = False,
 ) -> tractor._portal.Portal:
     """If no ``brokerd.{brokername}`` daemon-actor can be found,
     spawn one in a local subactor and return a portal to it.
@@ -97,11 +99,6 @@ async def maybe_spawn_brokerd(
     if loglevel:
         get_console_log(loglevel)
 
-    # disable debugger in brokerd?
-    # tractor._state._runtime_vars['_debug_mode'] = False
-
-    tractor_kwargs['loglevel'] = loglevel
-
     brokermod = get_brokermod(brokername)
     dname = f'brokerd.{brokername}'
     async with tractor.find_actor(dname) as portal:
@@ -113,18 +110,25 @@ async def maybe_spawn_brokerd(
         else:  # no daemon has been spawned yet
 
             log.info(f"Spawning {brokername} broker daemon")
+
+            # retrieve any special config from the broker mod
             tractor_kwargs = getattr(brokermod, '_spawn_kwargs', {})
-            async with tractor.open_nursery() as nursery:
+
+            async with tractor.open_nursery(
+                debug_mode=False,
+            ) as nursery:
                 try:
                     # spawn new daemon
                     portal = await nursery.start_actor(
                         dname,
                         enable_modules=_data_mods + [brokermod.__name__],
                         loglevel=loglevel,
+                        debug_mode=debug_mode,
                         **tractor_kwargs
                     )
                     async with tractor.wait_for_actor(dname) as portal:
                         yield portal
+
                 finally:
                     # client code may block indefinitely so cancel when
                     # teardown is invoked
@@ -235,9 +239,15 @@ async def open_feed(
     )
 
     async with maybe_spawn_brokerd(
+
         brokername,
         loglevel=loglevel,
+
+        # TODO: add a cli flag for this
+        debug_mode=False,
+
     ) as portal:
+
         stream = await portal.run(
             mod.stream_quotes,
 
diff --git a/piker/ui/cli.py b/piker/ui/cli.py
index fcb9b854..a0912497 100644
--- a/piker/ui/cli.py
+++ b/piker/ui/cli.py
@@ -91,7 +91,7 @@ def monitor(config, rate, name, dhost, test, tl):
 @click.option('--rate', '-r', default=1, help='Logging level')
 @click.argument('symbol', required=True)
 @click.pass_obj
-def optschain(config, symbol, date, tl, rate, test):
+def optschain(config, symbol, date, rate, test):
     """Start an option chain UI
     """
     # global opts
@@ -117,7 +117,7 @@ def optschain(config, symbol, date, tl, rate, test):
     tractor.run(
         partial(main, tries=1),
         name='kivy-options-chain',
-        loglevel=loglevel if tl else None,
+        # loglevel=loglevel if tl else None,
     )