diff options
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/process/exception')
2 files changed, 8 insertions, 36 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/process/exception/process_failed_exception.rs b/crates/shirabe-external-packages/src/symfony/process/exception/process_failed_exception.rs index a3645d62..b99e876a 100644 --- a/crates/shirabe-external-packages/src/symfony/process/exception/process_failed_exception.rs +++ b/crates/shirabe-external-packages/src/symfony/process/exception/process_failed_exception.rs @@ -29,13 +29,11 @@ impl ProcessFailedException { process.get_working_directory().unwrap_or_default(), ); - if !process.is_output_disabled() { - error += &format!( - "\n\nOutput:\n================\n{}\n\nError Output:\n================\n{}", - process.get_output()?, - process.get_error_output()?, - ); - } + error += &format!( + "\n\nOutput:\n================\n{}\n\nError Output:\n================\n{}", + process.get_output()?, + process.get_error_output()?, + ); Ok(Self { message: error, diff --git a/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs b/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs index 45cb6939..46564c37 100644 --- a/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs +++ b/crates/shirabe-external-packages/src/symfony/process/exception/process_timed_out_exception.rs @@ -6,20 +6,11 @@ use crate::symfony::process::process::Process; pub struct ProcessTimedOutException { pub message: String, pub code: i64, - timeout_type: i64, - exceeded_timeout: Option<f64>, } impl ProcessTimedOutException { - pub const TYPE_GENERAL: i64 = 1; - pub const TYPE_IDLE: i64 = 2; - - pub fn new(process: &Process, timeout_type: i64) -> Self { - let exceeded_timeout = match timeout_type { - Self::TYPE_GENERAL => process.get_timeout(), - Self::TYPE_IDLE => process.get_idle_timeout(), - _ => panic!("Unknown timeout type \"{}\".", timeout_type), - }; + pub fn new(process: &Process) -> Self { + let exceeded_timeout = process.get_timeout(); let message = format!( "The process \"{}\" exceeded the timeout of {} seconds.", @@ -27,24 +18,7 @@ impl ProcessTimedOutException { exceeded_timeout.map(|t| t.to_string()).unwrap_or_default(), ); - Self { - message, - code: 0, - timeout_type, - exceeded_timeout, - } - } - - pub fn is_general_timeout(&self) -> bool { - Self::TYPE_GENERAL == self.timeout_type - } - - pub fn is_idle_timeout(&self) -> bool { - Self::TYPE_IDLE == self.timeout_type - } - - pub fn get_exceeded_timeout(&self) -> Option<f64> { - self.exceeded_timeout + Self { message, code: 0 } } } |