Skip to content

Commit

Permalink
Fix logging levels (#284)
Browse files Browse the repository at this point in the history
* Fix logging levels

Fixed file locks logging levels and request start/end logging levels.

* Fix more log levels
  • Loading branch information
jbsparrow authored Nov 14, 2024
1 parent 0e97937 commit 7123955
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions cyberdrop_dl/clients/download_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ def __init__(self, manager: Manager, client_manager: ClientManager) -> None:
def add_request_log_hooks(self) -> None:
async def on_request_start(*args):
params: aiohttp.TraceRequestStartParams = args[2]
log(f"Starting download {params.method} request to {params.url}", 40)
log(f"Starting download {params.method} request to {params.url}", 20)

async def on_request_end(*args):
params: aiohttp.TraceRequestEndParams = args[2]
log(f"Finishing download {params.method} request to {params.url}", 40)
log(f"Response status for {params.url}: {params.response.status}", 40)
log(f"Finishing download {params.method} request to {params.url}", 20)
log(f"Response status for {params.url}: {params.response.status}", 20)

trace_config = aiohttp.TraceConfig()
trace_config.on_request_start.append(on_request_start)
Expand Down
6 changes: 3 additions & 3 deletions cyberdrop_dl/clients/scraper_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ def __init__(self, client_manager: ClientManager) -> None:
def add_request_log_hooks(self) -> None:
async def on_request_start(*args):
params: aiohttp.TraceRequestStartParams = args[2]
log(f"Starting download {params.method} request to {params.url}", 40)
log(f"Starting download {params.method} request to {params.url}", 20)

async def on_request_end(*args):
params: aiohttp.TraceRequestEndParams = args[2]
log(f"Finishing download {params.method} request to {params.url}", 40)
log(f"Response status for {params.url}: {params.response.status}", 40)
log(f"Finishing download {params.method} request to {params.url}", 20)
log(f"Response status for {params.url}: {params.response.status}", 20)

trace_config = aiohttp.TraceConfig()
trace_config.on_request_start.append(on_request_start)
Expand Down
12 changes: 6 additions & 6 deletions cyberdrop_dl/managers/download_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ def __init__(self) -> None:
async def check_lock(self, filename: str) -> None:
"""Checks if the file is locked."""
try:
log_debug(f"Checking lock for {filename}", 40)
log_debug(f"Checking lock for {filename}", 20)
await self._locked_files[filename].acquire()
log_debug(f"Lock for {filename} acquired", 40)
log_debug(f"Lock for {filename} acquired", 20)
except KeyError:
log_debug(f"Lock for {filename} does not exist", 40)
log_debug(f"Lock for {filename} does not exist", 20)
self._locked_files[filename] = asyncio.Lock()
await self._locked_files[filename].acquire()
log_debug(f"Lock for {filename} acquired", 40)
log_debug(f"Lock for {filename} acquired", 20)

async def release_lock(self, filename: str) -> None:
"""Releases the file lock."""
with contextlib.suppress(KeyError, RuntimeError):
log_debug(f"Releasing lock for {filename}", 40)
log_debug(f"Releasing lock for {filename}", 20)
self._locked_files[filename].release()
log_debug(f"Lock for {filename} released", 40)
log_debug(f"Lock for {filename} released", 20)


class DownloadManager:
Expand Down

0 comments on commit 7123955

Please sign in to comment.