From ff638b2d1339b7f4070be967e8ab88d1aa181460 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:34:59 +0100 Subject: [PATCH] changed mqtt step notification topic to 'stepnotification' --- cbpi/__init__.py | 3 ++- cbpi/controller/step_controller.py | 10 +++++----- cbpi/craftbeerpi.py | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index d18225d..cfdd55a 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1 +1,2 @@ -__version__ = "4.0.1.a9" +__version__ = "4.0.1.a10" + diff --git a/cbpi/controller/step_controller.py b/cbpi/controller/step_controller.py index 876d5c7..f1da575 100644 --- a/cbpi/controller/step_controller.py +++ b/cbpi/controller/step_controller.py @@ -117,7 +117,7 @@ class StepController: step = self.find_by_status(StepState.STOP) if step is not None: logging.info("Resume step") - self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Resume", message="Calling resume step")) + self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Resume", message="Calling resume step")) await self.start_step(step) await self.save() return @@ -125,13 +125,13 @@ class StepController: step = self.find_by_status(StepState.INITIAL) if step is not None: logging.info("Start Step") - self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Start", message="Calling start step")) + self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Start", message="Calling start step")) self.push_udpate(complete=True) await self.start_step(step) await self.save() return self.cbpi.notify("Brewing Complete", "Now the yeast will take over",action=[NotificationAction("OK")]) - self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Brewing completed", message="Now the yeast will take over")) + self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Brewing completed", message="Now the yeast will take over")) logging.info("BREWING COMPLETE") async def previous(self): @@ -172,7 +172,7 @@ class StepController: logging.info("CALLING STOP STEP") try: await step.instance.stop() - self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Pause", message="Calling paue step")) + self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Pause", message="Calling paue step")) step.status = StepState.STOP await self.save() @@ -189,7 +189,7 @@ class StepController: item.status = StepState.INITIAL try: await item.instance.reset() - self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Stop", message="Calling stop step")) + self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Stop", message="Calling stop step")) except: logging.warning("No Step Instance - Id: %s", item.id) await self.save() diff --git a/cbpi/craftbeerpi.py b/cbpi/craftbeerpi.py index 7a5f685..4c2f548 100644 --- a/cbpi/craftbeerpi.py +++ b/cbpi/craftbeerpi.py @@ -55,7 +55,6 @@ from cbpi.http_endpoints.http_fermentation import FermentationHttpEndpoints import shortuuid logger = logging.getLogger(__name__) - @web.middleware async def error_middleware(request, handler): try: