mirror of
https://github.com/dmunozv04/iSponsorBlockTV.git
synced 2025-12-07 20:36:44 +03:00
Merge pull request #269 from dmunozv04/improved-logging
Improve logging
This commit is contained in:
@@ -152,8 +152,20 @@ def cli(ctx, data, debug, setup, setup_cli):
|
|||||||
ctx.ensure_object(dict)
|
ctx.ensure_object(dict)
|
||||||
ctx.obj["data_dir"] = data
|
ctx.obj["data_dir"] = data
|
||||||
ctx.obj["debug"] = debug
|
ctx.obj["debug"] = debug
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
ctx.obj["logger"] = logger
|
||||||
|
sh = logging.StreamHandler()
|
||||||
|
sh.setFormatter(
|
||||||
|
logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
||||||
|
)
|
||||||
|
logger.addHandler(sh)
|
||||||
|
|
||||||
if debug:
|
if debug:
|
||||||
logging.basicConfig(level=logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
|
else:
|
||||||
|
logger.setLevel(logging.INFO)
|
||||||
|
|
||||||
if ctx.invoked_subcommand is None:
|
if ctx.invoked_subcommand is None:
|
||||||
if setup:
|
if setup:
|
||||||
ctx.invoke(setup_command)
|
ctx.invoke(setup_command)
|
||||||
|
|||||||
@@ -18,16 +18,6 @@ class DeviceListener:
|
|||||||
self.cancelled = False
|
self.cancelled = False
|
||||||
self.logger = logging.getLogger(f"iSponsorBlockTV-{device.screen_id}")
|
self.logger = logging.getLogger(f"iSponsorBlockTV-{device.screen_id}")
|
||||||
self.web_session = web_session
|
self.web_session = web_session
|
||||||
if debug:
|
|
||||||
self.logger.setLevel(logging.DEBUG)
|
|
||||||
else:
|
|
||||||
self.logger.setLevel(logging.INFO)
|
|
||||||
sh = logging.StreamHandler()
|
|
||||||
sh.setFormatter(
|
|
||||||
logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
|
||||||
)
|
|
||||||
self.logger.addHandler(sh)
|
|
||||||
self.logger.info("Starting device")
|
|
||||||
self.lounge_controller = ytlounge.YtLoungeApi(
|
self.lounge_controller = ytlounge.YtLoungeApi(
|
||||||
device.screen_id, config, api_helper, self.logger
|
device.screen_id, config, api_helper, self.logger
|
||||||
)
|
)
|
||||||
@@ -60,6 +50,7 @@ class DeviceListener:
|
|||||||
except BaseException:
|
except BaseException:
|
||||||
await asyncio.sleep(10)
|
await asyncio.sleep(10)
|
||||||
while not (await self.is_available()) and not self.cancelled:
|
while not (await self.is_available()) and not self.cancelled:
|
||||||
|
self.logger.debug("Waiting for device to be available")
|
||||||
await asyncio.sleep(10)
|
await asyncio.sleep(10)
|
||||||
try:
|
try:
|
||||||
await lounge_controller.connect()
|
await lounge_controller.connect()
|
||||||
@@ -67,6 +58,7 @@ class DeviceListener:
|
|||||||
pass
|
pass
|
||||||
while not lounge_controller.connected() and not self.cancelled:
|
while not lounge_controller.connected() and not self.cancelled:
|
||||||
# Doesn't connect to the device if it's a kids profile (it's broken)
|
# Doesn't connect to the device if it's a kids profile (it's broken)
|
||||||
|
self.logger.debug("Waiting for device to be connected")
|
||||||
await asyncio.sleep(10)
|
await asyncio.sleep(10)
|
||||||
try:
|
try:
|
||||||
await lounge_controller.connect()
|
await lounge_controller.connect()
|
||||||
@@ -76,7 +68,7 @@ class DeviceListener:
|
|||||||
"Connected to device %s (%s)", lounge_controller.screen_name, self.name
|
"Connected to device %s (%s)", lounge_controller.screen_name, self.name
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
self.logger.info("Subscribing to lounge")
|
self.logger.debug("Subscribing to lounge")
|
||||||
sub = await lounge_controller.subscribe_monitored(self)
|
sub = await lounge_controller.subscribe_monitored(self)
|
||||||
await sub
|
await sub
|
||||||
except BaseException:
|
except BaseException:
|
||||||
|
|||||||
Reference in New Issue
Block a user