Skip to content

Commit dbd16fc

Browse files
committed
Reenable process printing
1 parent d2c418f commit dbd16fc

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

choreographer/browser_async.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import annotations
44

55
import asyncio
6+
import os
67
import subprocess
78
import warnings
89
from asyncio import Lock
@@ -101,15 +102,14 @@ def __init__(
101102
self._channel = channel_cls()
102103
self._broker = Broker(self, self._channel)
103104
self._browser_impl = browser_cls(self._channel, path, **kwargs)
104-
# if hasattr(browser_cls, "logger_parser"):
105-
# parser = browser_cls.logger_parser # noqa: ERA001
106-
# else
107-
# parser = Non # noqa: ERA001
108-
# self._logger_pipe, _ = logistro.getPipeLogger(
109-
# "browser_proc",
110-
# parser=parser # noqa: ERA001,
111-
# ) # BUG TODO REGRESSION
112-
self._logger_pipe = subprocess.DEVNULL
105+
if hasattr(browser_cls, "logger_parser"):
106+
parser = browser_cls.logger_parser
107+
else:
108+
parser = None
109+
self._logger_pipe, _ = logistro.getPipeLogger(
110+
"browser_proc",
111+
parser=parser,
112+
)
113113

114114
async def open(self) -> None:
115115
"""Open the browser."""
@@ -204,8 +204,8 @@ async def close(self) -> None:
204204
pass
205205
self._broker.clean()
206206
_logger.info("Broker cleaned up.")
207-
# if self._logger_pipe:
208-
# os.close(self._logger_pipe) # noqa: ERA001 BUG TODO REGRESSION
207+
if self._logger_pipe:
208+
os.close(self._logger_pipe)
209209
_logger.info("Logging pipe closed.")
210210
self._channel.close()
211211
_logger.info("Browser channel closed.")

choreographer/browser_sync.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from __future__ import annotations
44

5+
import os
56
import subprocess
67
from threading import Lock
78
from typing import TYPE_CHECKING
@@ -86,15 +87,14 @@ def __init__(
8687
self._channel = channel_cls()
8788
self._broker = BrokerSync(self, self._channel)
8889
self._browser_impl = browser_cls(self._channel, path, **kwargs)
89-
# if hasattr(browser_cls, "logger_parser"):
90-
# parser = browser_cls.logger_parser # noqa: ERA001
91-
# else: # noqa: ERA001
92-
# parser = None # noqa: ERA001
93-
# self._logger_pipe, _ = logistro.getPipeLogger(
94-
# "browser_proc",
95-
# parser=parser, # noqa: ERA001
96-
# ) # BUG TODO REGRESSION
97-
self._logger_pipe = subprocess.DEVNULL
90+
if hasattr(browser_cls, "logger_parser"):
91+
parser = browser_cls.logger_parser
92+
else:
93+
parser = None
94+
self._logger_pipe, _ = logistro.getPipeLogger(
95+
"browser_proc",
96+
parser=parser,
97+
)
9898

9999
def open(self) -> None:
100100
"""Open the browser."""
@@ -158,7 +158,8 @@ def close(self) -> None:
158158
_logger.info("browser._close() called successfully.")
159159
except ProcessLookupError:
160160
pass
161-
# os.close(self._logger_pipe) # noqa: ERA001 bug regression
161+
if self._logger_pipe:
162+
os.close(self._logger_pipe)
162163
_logger.info("Logging pipe closed.")
163164
self._channel.close()
164165
_logger.info("Browser channel closed.")

0 commit comments

Comments
 (0)