From 38e3c0abefb82a3d0bbb54ae3132aac920b15b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 12 May 2022 09:29:28 +0200 Subject: Move Message to message.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- crates/core/tedge_api/examples/heartbeat.rs | 4 ++-- crates/core/tedge_api/examples/universal_log.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/core/tedge_api/examples') diff --git a/crates/core/tedge_api/examples/heartbeat.rs b/crates/core/tedge_api/examples/heartbeat.rs index 654c4311..b253009b 100644 --- a/crates/core/tedge_api/examples/heartbeat.rs +++ b/crates/core/tedge_api/examples/heartbeat.rs @@ -4,8 +4,8 @@ use async_trait::async_trait; use futures::FutureExt; use tedge_api::{ address::ReplySenderFor, - message::MessageType, - plugin::{AcceptsReplies, BuiltPlugin, Handle, Message, PluginDeclaration, PluginExt}, + message::{AcceptsReplies, Message, MessageType}, + plugin::{BuiltPlugin, Handle, PluginDeclaration, PluginExt}, Address, CancellationToken, Plugin, PluginBuilder, PluginConfiguration, PluginDirectory, PluginError, }; diff --git a/crates/core/tedge_api/examples/universal_log.rs b/crates/core/tedge_api/examples/universal_log.rs index 82ff3130..34090040 100644 --- a/crates/core/tedge_api/examples/universal_log.rs +++ b/crates/core/tedge_api/examples/universal_log.rs @@ -4,8 +4,8 @@ use async_trait::async_trait; use futures::FutureExt; use tedge_api::{ address::ReplySenderFor, - message::{AnyMessage, MessageType}, - plugin::{AnyMessages, BuiltPlugin, Handle, Message, PluginDeclaration, PluginExt}, + message::{AnyMessage, Message, MessageType}, + plugin::{AnyMessages, BuiltPlugin, Handle, PluginDeclaration, PluginExt}, Address, CancellationToken, Plugin, PluginBuilder, PluginConfiguration, PluginDirectory, PluginError, }; -- cgit v1.2.3 From d3df17fbca953c1cde1370fa7a9d184834d26296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 12 May 2022 09:30:34 +0200 Subject: Remove 'unused' warning messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcel Müller --- crates/core/tedge_api/examples/print_config.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'crates/core/tedge_api/examples') diff --git a/crates/core/tedge_api/examples/print_config.rs b/crates/core/tedge_api/examples/print_config.rs index ba6e7a6b..8be855e0 100644 --- a/crates/core/tedge_api/examples/print_config.rs +++ b/crates/core/tedge_api/examples/print_config.rs @@ -1,3 +1,4 @@ +#![allow(dead_code, unused)] use std::collections::HashMap; use nu_ansi_term::Color; -- cgit v1.2.3 From 02bfa3768be59b211daddd9b66203b787fd72153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=BCller?= Date: Thu, 12 May 2022 10:09:02 +0200 Subject: Add TypeUUID to Messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows messages to be identified by their UUID. This means that messages are no longer identified by the internal TypeId as provided from rustc but our choosing. This allows for more powerful features along the line, such as external programs being able to specify messages at all. Signed-off-by: Marcel Müller --- crates/core/tedge_api/examples/heartbeat.rs | 7 +++++-- crates/core/tedge_api/examples/universal_log.rs | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'crates/core/tedge_api/examples') diff --git a/crates/core/tedge_api/examples/heartbeat.rs b/crates/core/tedge_api/examples/heartbeat.rs index b253009b..8d64232a 100644 --- a/crates/core/tedge_api/examples/heartbeat.rs +++ b/crates/core/tedge_api/examples/heartbeat.rs @@ -10,17 +10,20 @@ use tedge_api::{ PluginError, }; use tokio::sync::RwLock; +use type_uuid::TypeUuid; +#[derive(Debug, TypeUuid)] +#[uuid = "94916be9-17ba-4bca-a3a0-408d33136fed"] /// A message that represents a heartbeat that gets sent to plugins -#[derive(Debug)] struct Heartbeat; impl Message for Heartbeat {} impl AcceptsReplies for Heartbeat { type Reply = HeartbeatStatus; } +#[derive(Debug, TypeUuid)] +#[uuid = "a6d03c65-51bf-4f89-b383-c67c9ed8533b"] /// The reply for a heartbeat -#[derive(Debug)] enum HeartbeatStatus { Alive, Degraded, diff --git a/crates/core/tedge_api/examples/universal_log.rs b/crates/core/tedge_api/examples/universal_log.rs index 34090040..064ffa22 100644 --- a/crates/core/tedge_api/examples/universal_log.rs +++ b/crates/core/tedge_api/examples/universal_log.rs @@ -10,13 +10,16 @@ use tedge_api::{ PluginError, }; use tokio::sync::RwLock; +use type_uuid::TypeUuid; /// A message that represents a heartbeat that gets sent to plugins -#[derive(Debug)] +#[derive(Debug, TypeUuid)] +#[uuid = "1f807f7b-888f-4881-a1b5-16380e32f8c2"] struct Heartbeat; impl Message for Heartbeat {} -#[derive(Debug)] +#[derive(Debug, TypeUuid)] +#[uuid = "346e233f-c24a-47e0-a15b-3ec0d1e19019"] struct RandomData; impl Message for RandomData {} -- cgit v1.2.3