From b92cead7d5d0caa3bf936a447a0a5b5cb2f12f46 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Sat, 20 Aug 2022 19:40:04 +0200
Subject: [PATCH] remove not required code

---
 bumper/mqtt/proxy.py  |  6 ------
 bumper/mqtt/server.py | 16 +---------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/bumper/mqtt/proxy.py b/bumper/mqtt/proxy.py
index 24261ca..b1b94b2 100644
--- a/bumper/mqtt/proxy.py
+++ b/bumper/mqtt/proxy.py
@@ -31,12 +31,6 @@ _LOGGER = get_logger("proxymode")
 # /[receiver did]/[receiver class]]/[receiver resource]/[q|p/[request id/j
 # [q|p] q-> request p-> response
 
-TOPIC_P2P = re.compile(
-    "iot/p2p/(?P<command>[^/]+)/(?P<sender_id>[^/]+)/(?P<sender_cls>[^/]+)/(?P<sender_resource>[^/]+)/"
-    "/(?P<receiver_id>[^/]+)/(?P<receiver_cls>[^/]+)/(?P<receiver_resource>[^/]+)/(?P<mode>[^/]+)/"
-    "(?P<request_id>[^/]+)/(?P<data_type>[^/]+)"
-)
-
 
 class ProxyClient:
     """Mqtt client, which proxies all messages to the ecovacs servers."""
diff --git a/bumper/mqtt/server.py b/bumper/mqtt/server.py
index 36551dc..3e417c2 100644
--- a/bumper/mqtt/server.py
+++ b/bumper/mqtt/server.py
@@ -174,22 +174,8 @@ class BumperMQTTServerPlugin:
 
                     if bumper.bumper_proxy_mode:
                         mqtt_server = await dns.resolve("mq-ww.ecouser.net")
-                        if mqtt_server:
-                            proxymodelog.info(
-                                f"MQTT Proxy Mode - Using server {mqtt_server}"
-                            )
-                        else:
-                            proxymodelog.error(
-                                "MQTT Proxy Mode - No server found! Load defaults or "
-                                "set mqtt_server in config_proxymode table!"
-                            )
-                            proxymodelog.exception(
-                                f"MQTT Proxy Mode - Exiting due to no MQTT Server configured!"
-                            )
-                            exit(1)
-
                         proxymodelog.info(
-                            f"MQTT Proxy Mode - Proxy Bot to MQTT - Client_id: {client_id} - Username: {username}"
+                            f"MQTT Proxy Mode - Using server {mqtt_server} for client {client_id}"
                         )
                         proxy = ProxyClient(
                             client_id, mqtt_server, config={"check_hostname": False}