Skip to content

Commit

Permalink
Code suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
javierdelapuente committed Sep 11, 2024
1 parent 172b820 commit f266001
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions paas_app_charmer/rabbitmq.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def __init__(self, charm: CharmBase, relation_name: str, username: str, vhost: s
)
self.framework.observe(
self.charm.on[relation_name].relation_departed,
self._on_rabbitmq_relation_changed,
self._on_rabbitmq_relation_departed,
)
self.framework.observe(
self.charm.on[relation_name].relation_broken,
Expand All @@ -117,6 +117,11 @@ def _on_rabbitmq_relation_changed(self, _: HookEvent) -> None:
if self.rabbitmq_uri():
self.on.ready.emit()

def _on_rabbitmq_relation_departed(self, _: HookEvent) -> None:
"""Handle RabbitMQ departed."""
if self.rabbitmq_uri():
self.on.ready.emit()

def _on_rabbitmq_relation_broken(self, _: HookEvent) -> None:
"""Handle RabbitMQ broken."""
self.on.departed.emit()
Expand Down Expand Up @@ -150,11 +155,11 @@ def request_access(self, username: str, vhost: str) -> None:
vhost: virtual host requested for RabbitMQ
"""
if self.model.unit.is_leader():
if self._rabbitmq_rel:
self._rabbitmq_rel.data[self.charm.app]["username"] = username
self._rabbitmq_rel.data[self.charm.app]["vhost"] = vhost
else:
if not self._rabbitmq_rel:
logger.warning("request_access but no rabbitmq relation")
return
self._rabbitmq_rel.data[self.charm.app]["username"] = username
self._rabbitmq_rel.data[self.charm.app]["vhost"] = vhost

def _rabbitmq_server_uri(self) -> str | None:
"""Return uri for rabbitmq-server.
Expand Down

0 comments on commit f266001

Please sign in to comment.