clean message AM-695/error-methods

Aaron Roller · Aaron Roller · commit a9a50ae9166b · 2021-03-27T21:54:01.000-07:00
diff --git a/src/super_lib/am_life_cycle.cpp b/src/super_lib/am_life_cycle.cpp
@@ -281,7 +281,7 @@ void AMLifeCycle::error(std::string error_code, bool forced)
 
 void AMLifeCycle::error(std::string message, std::string error_code, bool forced)
 {
-  std::string error_code_message = " Error[" + error_code + "] ";
+  std::string error_code_message = "Error[" + error_code + "] ";
   if(withinConfigureTolerance() && !forced)
   {
     ROS_WARN_STREAM_THROTTLE(throttle_info_.warn_throttle_s,"Ignoring tolerant error for (" << configure_tolerance_s << "s) `" << message << "` " << error_code_message << "[GFRT]");
@@ -290,7 +290,6 @@ void AMLifeCycle::error(std::string message, std::string error_code, bool forced
   {
     std::string forced_prefix = forced?"Terminal ":"";
     std::string repeat_prefix = "";
-
     //only change the state if 
     if(!life_cycle_mediator_.redundantError(life_cycle_info_))
     {
@@ -303,7 +302,7 @@ void AMLifeCycle::error(std::string message, std::string error_code, bool forced
       repeat_prefix = "Repeated ";
     }
     std::string error_explanation=forced_prefix + repeat_prefix + error_code_message;
-    ROS_ERROR_STREAM(message << "  state: " << life_cycle_mediator_.stateToString(life_cycle_info_.state) << error_explanation << " [R45Y]" );
+    ROS_ERROR_STREAM(message << " -> " << error_explanation << " [R45Y]" );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void AMLifeCycle::error(std::string error_code, bool forced)`
`281`	`281`
`282`	`282`	`void AMLifeCycle::error(std::string message, std::string error_code, bool forced)`
`283`	`283`	`{`
`284`		`- std::string error_code_message = " Error[" + error_code + "] ";`
	`284`	`+ std::string error_code_message = "Error[" + error_code + "] ";`
`285`	`285`	`if(withinConfigureTolerance() && !forced)`
`286`	`286`	`{`
`287`	`287`	ROS_WARN_STREAM_THROTTLE(throttle_info_.warn_throttle_s,"Ignoring tolerant error for (" << configure_tolerance_s << "s) `" << message << "` " << error_code_message << "[GFRT]");
`@@ -290,7 +290,6 @@ void AMLifeCycle::error(std::string message, std::string error_code, bool forced`
`290`	`290`	`{`
`291`	`291`	`std::string forced_prefix = forced?"Terminal ":"";`
`292`	`292`	`std::string repeat_prefix = "";`
`293`		`-`
`294`	`293`	`//only change the state if`
`295`	`294`	`if(!life_cycle_mediator_.redundantError(life_cycle_info_))`
`296`	`295`	`{`
`@@ -303,7 +302,7 @@ void AMLifeCycle::error(std::string message, std::string error_code, bool forced`
`303`	`302`	`repeat_prefix = "Repeated ";`
`304`	`303`	`}`
`305`	`304`	`std::string error_explanation=forced_prefix + repeat_prefix + error_code_message;`
`306`		`- ROS_ERROR_STREAM(message << " state: " << life_cycle_mediator_.stateToString(life_cycle_info_.state) << error_explanation << " [R45Y]" );`
	`305`	`+ ROS_ERROR_STREAM(message << " -> " << error_explanation << " [R45Y]" );`
`307`	`306`	`}`
`308`	`307`	`}`
`309`	`308`