Skip to content

Commit 0db187a

Browse files
committed
Clarify log message.
1 parent 8a25c8b commit 0db187a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

modbus4mqtt/modbus4mqtt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def _on_connect(self, client, userdata, flags, rc):
111111
for register in self._get_registers_with('set_topic'):
112112
self._mqtt_client.subscribe(self.prefix+register['set_topic'])
113113
print("Subscribed to {}".format(self.prefix+register['set_topic']))
114-
self._mqtt_client.publish(self.prefix+'modbus4mqtt', 'modbus4mqtt v{} starting up.'.format(version.version))
114+
self._mqtt_client.publish(self.prefix+'modbus4mqtt', 'modbus4mqtt v{} connected.'.format(version.version))
115115

116116
def _on_disconnect(self, client, userdata, rc):
117117
logging.warning("Disconnected from MQTT. Attempting to reconnect.")

tests/test_mqtt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test_connect(self):
7878
mock_mqtt().connect.assert_called_with('kroopit', 1885, 60)
7979

8080
m._on_connect(None, None, None, rc=0)
81-
mock_mqtt().publish.assert_called_with(MQTT_TOPIC_PREFIX+'/modbus4mqtt', 'modbus4mqtt v{} starting up.'.format(modbus4mqtt.version.version))
81+
mock_mqtt().publish.assert_called_with(MQTT_TOPIC_PREFIX+'/modbus4mqtt', 'modbus4mqtt v{} connected.'.format(modbus4mqtt.version.version))
8282
mock_mqtt().subscribe.assert_called_with(MQTT_TOPIC_PREFIX+'/subscribe')
8383
mock_mqtt().subscribe.assert_no_call(MQTT_TOPIC_PREFIX+'/publish')
8484

@@ -101,7 +101,7 @@ def replacement():
101101
mock_mqtt().connect.assert_called_with('kroopit', 1885, 60)
102102
m._on_connect(None, None, None, rc=1)
103103
# TODO implement some more thorough checks?
104-
mock_mqtt().publish.assert_no_call(MQTT_TOPIC_PREFIX+'/modbus4mqtt', 'modbus4mqtt v{} starting up.'.format(modbus4mqtt.version.version))
104+
mock_mqtt().publish.assert_no_call(MQTT_TOPIC_PREFIX+'/modbus4mqtt', 'modbus4mqtt v{} connected.'.format(modbus4mqtt.version.version))
105105

106106
def test_pub_on_change(self):
107107
with patch('paho.mqtt.client.Client') as mock_mqtt:

0 commit comments

Comments
 (0)