diff options
| author | Matthias Beyer <matthias.beyer@ifm.com> | 2022-05-27 14:23:22 +0200 |
|---|---|---|
| committer | Matthias Beyer <matthias.beyer@ifm.com> | 2022-05-27 14:23:22 +0200 |
| commit | 225b0cc2283111276a2c5a1918e6f1d226ffab19 (patch) | |
| tree | 7b8f1562ed58db835c1cbbc35843587942792f6f | |
| parent | 78f2614f5c82f7a96102443911bde1b905baf299 (diff) | |
| parent | 8e1c3c42fab9cdbc5c1f5ab009a14ae0e6c73eae (diff) | |
Merge branch 'feature/add_tedge_api/fix-error-returns' into feature/add_tedge_api_impl
| -rw-r--r-- | plugins/plugin_mqtt/src/config.rs | 5 | ||||
| -rw-r--r-- | plugins/plugin_mqtt/src/plugin.rs | 7 | ||||
| -rw-r--r-- | plugins/plugin_mqtt_measurement_bridge/src/lib.rs | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/plugin_mqtt/src/config.rs b/plugins/plugin_mqtt/src/config.rs index b93129bb..5a7c684e 100644 --- a/plugins/plugin_mqtt/src/config.rs +++ b/plugins/plugin_mqtt/src/config.rs @@ -80,7 +80,10 @@ impl TryFrom<i32> for QoS { paho_mqtt::QOS_0 => Ok(QoS::AtMostOnce), paho_mqtt::QOS_1 => Ok(QoS::AtLeastOnce), paho_mqtt::QOS_2 => Ok(QoS::ExactlyOnce), - _ => Err(miette::miette!("Failed to interpret '{}' as QOS", i)), + _ => Err(tedge_api::PluginError::from(miette::miette!( + "Failed to interpret '{}' as QOS", + i + ))), } } } diff --git a/plugins/plugin_mqtt/src/plugin.rs b/plugins/plugin_mqtt/src/plugin.rs index 52d5822d..25930aea 100644 --- a/plugins/plugin_mqtt/src/plugin.rs +++ b/plugins/plugin_mqtt/src/plugin.rs @@ -232,9 +232,10 @@ impl Handle<OutgoingMessage> for MqttPlugin { .into_diagnostic()?; debug!("Publishing message succeeded"); - Ok(()) } else { - return Err(crate::error::Error::NoClient).into_diagnostic(); - } + Err(crate::error::Error::NoClient).into_diagnostic()?; + }; + + Ok(()) } } diff --git a/plugins/plugin_mqtt_measurement_bridge/src/lib.rs b/plugins/plugin_mqtt_measurement_bridge/src/lib.rs index 3ba430ac..0c5e2ece 100644 --- a/plugins/plugin_mqtt_measurement_bridge/src/lib.rs +++ b/plugins/plugin_mqtt_measurement_bridge/src/lib.rs @@ -145,7 +145,7 @@ impl Handle<tedge_lib::measurement::Measurement> for MqttMeasurementBridgePlugin Ok(_) => trace!("Message forwarded to MQTT plugin"), Err(_) => { trace!("Message not send"); - return Err(Error::FailedToSendMessage).into_diagnostic(); + Err(Error::FailedToSendMessage).into_diagnostic()?; } } Ok(()) |