fix: Parameterization of the proc restart, and correction according to code review

Signed-off-by: Jeremy HERGAULT <[email protected]>

Author: reneca

prosa/src/core/error.rs

@@ -57,6 +57,7 @@ impl ProcError for std::io::Error {
 impl ProcError for openssl::error::Error {
     fn recoverable(&self) -> bool {
         if let Some(reason) = self.reason() {
+            // If it's an SSL protocol error, consider that can be recoverable. It's may be temporary related to a distant.
             reason.contains("SSL_")
         } else {
             false

prosa/src/core/main.rs

@@ -88,8 +88,8 @@ where
         0
     }
 
-    fn name(&self) -> &String {
-        &self.name
+    fn name(&self) -> &str {
+        self.name.as_str()
     }
 }
 
@@ -263,8 +263,8 @@ where
         0
     }
 
-    fn name(&self) -> &String {
-        &self.name
+    fn name(&self) -> &str {
+        self.name.as_str()
     }
 }
 

prosa/src/core/proc.rs

@@ -190,6 +190,10 @@ pub trait ProcSettings {
     /// Getter of the processor's adaptor configuration path
     fn get_adaptor_config_path(&self) -> Option<&String>;
 
+    /// Getter of the restart delay that must be apply to the processor if an error is trigger.
+    /// Return the duration to be add to every restart, and the max duration wait between restarts in seconds.
+    fn get_proc_restart_delay(&self) -> (Duration, u32);
+
     /// Getter of the processor's adaptor configuration
     fn get_adaptor_config<C>(&self) -> Result<C, ::config::ConfigError>
     where
@@ -219,7 +223,7 @@ pub trait ProcBusParam {
     fn get_proc_id(&self) -> u32;
 
     /// Provide the ProSA name based on ProSA settings
-    fn name(&self) -> &String;
+    fn name(&self) -> &str;
 }
 
 impl Debug for dyn ProcBusParam {
@@ -230,6 +234,9 @@ impl Debug for dyn ProcBusParam {
 
 /// Trait to define all processor handle functions
 pub trait ProcEpilogue {
+    /// Getter to know timer for processor restart in case of error
+    fn get_proc_restart_delay(&self) -> (std::time::Duration, u32);
+
     /// Method to remove the processor with a signal queue to the main task
     ///
     /// Once the processor is removed, all its associated service will be remove
@@ -258,7 +265,7 @@ where
         self.id
     }
 
-    fn name(&self) -> &String {
+    fn name(&self) -> &str {
         self.main.name()
     }
 }
@@ -457,7 +464,8 @@ where
                     .thread_name(proc_name.clone())
                     .build()
                     .unwrap();
-                let mut wait_time = Duration::ZERO;
+                let proc_restart_delay = self.get_proc_restart_delay();
+                let mut wait_time = proc_restart_delay.0;
                 loop {
                     if let Err(proc_err) = rt.block_on(self.internal_run(proc_name.clone())) {
                         let recovery_duration = proc_err.recovery_duration();
@@ -494,9 +502,9 @@ where
                         return;
                     }
 
-                    // Don't wait more than 5 minutes btween restarts
-                    if wait_time.as_secs() < 300 {
-                        wait_time += Duration::from_millis(50);
+                    // Don't wait more than the restart delay parameter
+                    if wait_time.as_secs() < proc_restart_delay.1 as u64 {
+                        wait_time += proc_restart_delay.0;
                         wait_time *= 2;
                     }
                 }

prosa/src/core/service.rs

@@ -200,8 +200,8 @@ where
         self.proc_id
     }
 
-    fn name(&self) -> &String {
-        &self.proc_name
+    fn name(&self) -> &str {
+        self.proc_name.as_str()
     }
 }
 

prosa_macros/src/proc.rs

@@ -169,7 +169,7 @@ fn generate_struct_impl_bus_param(
             }
 
             #[doc=concat!(" Getter of the ", stringify!(#item_ident), " processor Name")]
-            fn name(&self) -> &std::string::String {
+            fn name(&self) -> &std::primitive::str {
                 self.proc.name()
             }
         }
@@ -220,16 +220,27 @@ fn generate_struct_impl_config(
 
 fn generate_struct_impl_epilogue(
     item_struct: &syn::ItemStruct,
+    args: &ProcParams,
 ) -> syn::parse::Result<proc_macro2::TokenStream> {
     let item_ident = &item_struct.ident;
     let item_generics = &item_struct.generics;
 
+    let restart_settings_quote = if args.settings.is_some() {
+        quote! { prosa::core::proc::ProcSettings::get_proc_restart_delay(&self.settings) }
+    } else {
+        quote! { (std::time::Duration::from_millis(50), 300) }
+    };
+
     Ok(quote! {
         // The definition must be done for the protocol
         impl #item_generics prosa::core::proc::ProcEpilogue for #item_ident #item_generics
         where
             M: 'static + std::marker::Send + std::marker::Sync + std::marker::Sized + std::clone::Clone + std::fmt::Debug + prosa_utils::msg::tvf::Tvf + std::default::Default,
         {
+            fn get_proc_restart_delay(&self) -> (std::time::Duration, u32) {
+                #restart_settings_quote
+            }
+
             async fn remove_proc(&self, err: std::option::Option<Box<dyn prosa::core::error::ProcError + Send + Sync>>) -> Result<(), prosa::core::error::BusError> {
                 self.proc.remove_proc(err).await
             }
@@ -290,7 +301,7 @@ pub(crate) fn proc_impl(
             let struct_output = generate_struct(item_struct, &proc_args)?;
             let struct_impl_bus_param = generate_struct_impl_bus_param(&struct_output)?;
             let struct_impl_config = generate_struct_impl_config(&struct_output, &proc_args)?;
-            let struct_impl_epilogue = generate_struct_impl_epilogue(&struct_output)?;
+            let struct_impl_epilogue = generate_struct_impl_epilogue(&struct_output, &proc_args)?;
             Ok(quote! {
                 #struct_output
                 #struct_impl_bus_param

prosa_macros/src/settings.rs

@@ -87,6 +87,26 @@ fn generate_proc_settings_struct(
                 .parse2(quote! { adaptor_config_path: std::option::Option<std::string::String> })
                 .unwrap(),
         );
+
+        // Restart duration period
+        fields.named.push(
+            syn::Field::parse_named
+                .parse2(quote! {
+                    #[serde(skip_serializing)]
+                    proc_restart_duration_period: std::option::Option<std::time::Duration>
+                })
+                .unwrap(),
+        );
+
+        // Max restart period
+        fields.named.push(
+            syn::Field::parse_named
+                .parse2(quote! {
+                    #[serde(skip_serializing)]
+                    proc_max_restart_period: std::option::Option<std::primitive::u32>
+                })
+                .unwrap(),
+        );
     }
 
     Ok(item_struct)
@@ -102,6 +122,10 @@ fn generate_struct_impl_proc_settings(
             fn get_adaptor_config_path(&self) -> std::option::Option<&std::string::String> {
                 self.adaptor_config_path.as_ref()
             }
+
+            fn get_proc_restart_delay(&self) -> (std::time::Duration, u32) {
+                (self.proc_restart_duration_period.unwrap_or(std::time::Duration::from_millis(50)), self.proc_max_restart_period.unwrap_or(300))
+            }
         }
     })
 }
@@ -124,6 +148,18 @@ pub(crate) fn proc_settings_impl(item: syn::Item) -> syn::parse::Result<proc_mac
                     .unwrap(),
             );
             x.fields.push_punct(syn::token::Comma::default());
+            x.fields.push_value(
+                syn::FieldValue::parse
+                    .parse2(quote! { proc_restart_duration_period: None })
+                    .unwrap(),
+            );
+            x.fields.push_punct(syn::token::Comma::default());
+            x.fields.push_value(
+                syn::FieldValue::parse
+                    .parse2(quote! { proc_max_restart_period: None })
+                    .unwrap(),
+            );
+            x.fields.push_punct(syn::token::Comma::default());
         })?
         .into_token_stream()),
         _ => Err(syn::Error::new(