Fix formatting, log debug kafka calls
This commit is contained in:
parent
2b9435dddd
commit
3ec541c3f5
3 changed files with 24 additions and 22 deletions
|
@ -7,19 +7,17 @@ import logging
|
|||
import time
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
import aiokafka # type: ignore
|
||||
import asyncpg # type: ignore
|
||||
import aiokafka # type: ignore
|
||||
import asyncpg # type: ignore
|
||||
|
||||
from chweb.base import Service
|
||||
from chweb.models import Check
|
||||
from chweb.models import Check, PostgresConfig
|
||||
|
||||
|
||||
class Consumer(Service):
|
||||
@property
|
||||
def db(self):
|
||||
return Db(self.loop, self.logger, self.config.postgres.dbuser,
|
||||
self.config.postgres.dbpass, self.config.postgres.dbhost,
|
||||
self.config.postgres.dbport, self.config.postgres.dbname)
|
||||
return Db(self.loop, self.logger, self.config.postgres)
|
||||
|
||||
async def consume(self):
|
||||
"""
|
||||
|
@ -38,6 +36,7 @@ class Consumer(Service):
|
|||
try:
|
||||
check = Check(**json.loads(msg.value))
|
||||
self.queue.put_nowait(check)
|
||||
self.logger.debug(check)
|
||||
await db.save(check)
|
||||
except Exception as exc:
|
||||
err = "error processing message %s; failed with %s"
|
||||
|
@ -53,24 +52,25 @@ class Db:
|
|||
"""
|
||||
Database operations and handy helpers.
|
||||
"""
|
||||
|
||||
def __init__(self, loop: asyncio.AbstractEventLoop, logger: logging.Logger,
|
||||
user: str, passwd: str, host: str, port: int, dbname: str):
|
||||
pgconf: PostgresConfig):
|
||||
self.loop = loop
|
||||
self.logger = logger
|
||||
# Do a side effect here since without this there's not any point for
|
||||
# the application to start. Applies for tests as well.
|
||||
self.conn: Optional[asyncpg.Connection] = None
|
||||
self.user = user
|
||||
self.passwd = passwd
|
||||
self.host = host
|
||||
self.port = port
|
||||
self.dbname = dbname
|
||||
self.conf = pgconf
|
||||
|
||||
async def __aenter__(self):
|
||||
self.conn = await asyncpg.connect(host=self.host, port=self.port,
|
||||
user=self.user, password=self.passwd,
|
||||
database=self.dbname, loop=self.loop,
|
||||
timeout=60)
|
||||
self.conn = await asyncpg.connect(
|
||||
host=self.conf.dbhost,
|
||||
port=self.conf.dbport,
|
||||
user=self.conf.dbuser,
|
||||
password=self.conf.dbpass,
|
||||
database=self.conf.dbname,
|
||||
loop=self.loop, timeout=60,
|
||||
)
|
||||
return self
|
||||
|
||||
async def __aexit__(self, type_, value, traceback):
|
||||
|
@ -108,7 +108,6 @@ class Db:
|
|||
Writes a single record in the database. This is not very optimal, a
|
||||
better way would be to write a batch of status checks at once.
|
||||
"""
|
||||
tstamp = time.mktime(data.request_time.timetuple())
|
||||
if self.conn is not None:
|
||||
try:
|
||||
await self.conn.execute('''
|
||||
|
@ -120,5 +119,5 @@ class Db:
|
|||
data.request_time, data.response_time, data.status,
|
||||
data.url)
|
||||
except asyncpg.PostgresError as exc:
|
||||
self.logger.error("error in query %s", exc.query)
|
||||
self.logger.error("error in query %s", exc)
|
||||
raise
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue