projects
/
osm
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix in dbmemory query using '.cont' and '.ncont'
[osm/common.git]
/
osm_common
/
msgkafka.py
diff --git
a/osm_common/msgkafka.py
b/osm_common/msgkafka.py
index
b782685
..
1e22c9f
100644
(file)
--- a/
osm_common/msgkafka.py
+++ b/
osm_common/msgkafka.py
@@
-42,7
+42,7
@@
class MsgKafka(MsgBase):
self.logger = logging.getLogger(config["logger_name"])
self.host = config["host"]
self.port = config["port"]
self.logger = logging.getLogger(config["logger_name"])
self.host = config["host"]
self.port = config["port"]
- self.loop = asyncio.get_event_loop()
+ self.loop =
config.get("loop") or
asyncio.get_event_loop()
self.broker = str(self.host) + ":" + str(self.port)
self.group_id = config.get("group_id")
self.broker = str(self.host) + ":" + str(self.port)
self.group_id = config.get("group_id")
@@
-84,6
+84,14
@@
class MsgKafka(MsgBase):
raise MsgException("Error reading {} topic: {}".format(topic, str(e)))
async def aiowrite(self, topic, key, msg, loop=None):
raise MsgException("Error reading {} topic: {}".format(topic, str(e)))
async def aiowrite(self, topic, key, msg, loop=None):
+ """
+ Asyncio write
+ :param topic: str kafka topic
+ :param key: str kafka key
+ :param msg: str or dictionary kafka message
+ :param loop: asyncio loop. To be DEPRECATED! in near future!!! loop must be provided inside config at connect
+ :return: None
+ """
if not loop:
loop = self.loop
if not loop:
loop = self.loop
@@
-97,36
+105,43
@@
class MsgKafka(MsgBase):
finally:
await self.producer.stop()
finally:
await self.producer.stop()
- async def aioread(self, topic, loop=None, callback=None, aiocallback=None, **kwargs):
+ async def aioread(self, topic, loop=None, callback=None, aiocallback=None,
group_id=None,
**kwargs):
"""
"""
- Asyncio read from one or several topics.
It blocks.
+ Asyncio read from one or several topics.
:param topic: can be str: single topic; or str list: several topics
:param topic: can be str: single topic; or str list: several topics
- :param loop: asyncio loop
+ :param loop: asyncio loop
. To be DEPRECATED! in near future!!! loop must be provided inside config at connect
:param callback: synchronous callback function that will handle the message in kafka bus
:param aiocallback: async callback function that will handle the message in kafka bus
:param callback: synchronous callback function that will handle the message in kafka bus
:param aiocallback: async callback function that will handle the message in kafka bus
+ :param group_id: kafka group_id to use. Can be False (set group_id to None), None (use general group_id provided
+ at connect inside config), or a group_id string
:param kwargs: optional keyword arguments for callback function
:return: If no callback defined, it returns (topic, key, message)
"""
if not loop:
loop = self.loop
:param kwargs: optional keyword arguments for callback function
:return: If no callback defined, it returns (topic, key, message)
"""
if not loop:
loop = self.loop
+ if group_id is False:
+ group_id = None
+ elif group_id is None:
+ group_id = self.group_id
try:
if isinstance(topic, (list, tuple)):
topic_list = topic
else:
topic_list = (topic,)
try:
if isinstance(topic, (list, tuple)):
topic_list = topic
else:
topic_list = (topic,)
- self.consumer = AIOKafkaConsumer(loop=loop, bootstrap_servers=self.broker, group_id=
self.
group_id)
+ self.consumer = AIOKafkaConsumer(loop=loop, bootstrap_servers=self.broker, group_id=group_id)
await self.consumer.start()
self.consumer.subscribe(topic_list)
async for message in self.consumer:
if callback:
await self.consumer.start()
self.consumer.subscribe(topic_list)
async for message in self.consumer:
if callback:
- callback(message.topic, yaml.
load(message.key), yaml.
load(message.value), **kwargs)
+ callback(message.topic, yaml.
safe_load(message.key), yaml.safe_
load(message.value), **kwargs)
elif aiocallback:
elif aiocallback:
- await aiocallback(message.topic, yaml.load(message.key), yaml.load(message.value), **kwargs)
+ await aiocallback(message.topic, yaml.safe_load(message.key), yaml.safe_load(message.value),
+ **kwargs)
else:
else:
- return message.topic, yaml.
load(message.key), yaml.
load(message.value)
+ return message.topic, yaml.
safe_load(message.key), yaml.safe_
load(message.value)
except KafkaError as e:
raise MsgException(str(e))
finally:
except KafkaError as e:
raise MsgException(str(e))
finally: