Commit 98e88475 authored by Harald Klein's avatar Harald Klein

Merge branch 'tang-updates' into 'develop'

Tang updates

See merge request !41
parents 291b561f 539c830c
Pipeline #475 passed with stage
in 2 minutes and 43 seconds
......@@ -19,3 +19,4 @@ version.h
*.pyc
*.swp
debian/*.log
......@@ -95,7 +95,7 @@
<div class="input-group">
<input type="password" class="form-control" disabled="disabled" data-translateable="true" data-bind="value:currentPin" _placeholder="pin code"></input>
<span class="input-group-btn">
<button type="button" data-bin="click:resetPin" class="btn btn-primary" data-bind="click:resetPin"><i class="en-cancel"></i></button>
<button type="button" class="btn btn-primary" data-bind="click:resetPin"><i class="en-cancel"></i></button>
</span>
</div>
</div>
......
......@@ -238,7 +238,7 @@ class AgoApp:
self.log_handler.setFormatter(self.log_formatter)
root.addHandler(self.log_handler)
self.log = logging.getLogger("app")
self.log = logging.getLogger(self.app_name)
def setup_connection(self):
"""Create an AgoConnection instance, assigned to self.connection"""
......
......@@ -38,7 +38,7 @@ class AgoMqttTransport(agoclient.agotransport.AgoTransport):
self.pending_replies = {}
def start(self):
self.mqtt = mqtt.Client(self.broker, clean_session=True)
self.mqtt = mqtt.Client(client_id=self.connection_uuid, clean_session=True)
if self.username and self.password:
self.mqtt.username_pw_set(self.username, self.password)
......@@ -217,4 +217,5 @@ class AgoMqttTransport(agoclient.agotransport.AgoTransport):
def _sendreply(self, reply_to, content):
"""Internal used to send a reply."""
self.log.trace("Sending reply to %s: %s", reply_to, content)
self._send_message(reply_to, content)
\ No newline at end of file
self._send_message(reply_to, content)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment