Merge pull request ManageIQ#99 from billfitzgerald0120/remove_truncat…

…e_msg Remove truncate from user message in multiple methods.
mkanoor · May 2, 2017 · 19769b9 · 19769b9
2 parents 4b97013 + c72b50a
commit 19769b9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...Tower/Service/Provisioning/StateMachines/Provision.class/__methods__/check_provisioned.rb b/...Tower/Service/Provisioning/StateMachines/Provision.class/__methods__/check_provisioned.rb
@@ -39,7 +39,7 @@ def check_provisioned(task, service)
                       @handle.log('error', 'Please examine job console output for more details') if @handle.root['ae_result'] == 'error'
 
                       job.refresh_ems
-                      task.miq_request.user_message = @handle.root['ae_reason'].truncate(255) unless @handle.root['ae_reason'].blank?
+                      task.miq_request.user_message = @handle.root['ae_reason'] unless @handle.root['ae_reason'].blank?
                     end
                   end
 

diff --git a/.../AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__methods__/provision.rb b/.../AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__methods__/provision.rb
@@ -40,7 +40,7 @@ def run(task, service)
                   rescue => err
                     @handle.root['ae_result'] = 'error'
                     @handle.root['ae_reason'] = err.message
-                    task.miq_request.user_message = err.message.truncate(255)
+                    task.miq_request.user_message = err.message
                     @handle.log("error", "Template #{service.job_template.name} launching failed. Reason: #{err.message}")
                   end
                 end

diff --git a/...d/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.rb b/...d/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/check_provisioned.rb
@@ -29,7 +29,7 @@ def main
                 end
 
                 unless @handle.root['ae_reason'].blank?
-                  task.miq_request.user_message = @handle.root['ae_reason'].truncate(255)
+                  task.miq_request.user_message = @handle.root['ae_reason']
                 end
               end
 

diff --git a/...eIQ/Cloud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision.rb b/...eIQ/Cloud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision.rb
@@ -25,7 +25,7 @@ def main
                 rescue => err
                   @handle.root['ae_result'] = 'error'
                   @handle.root['ae_reason'] = err.message
-                  task.miq_request.user_message = err.message.truncate(255)
+                  task.miq_request.user_message = err.message
                   @handle.log("error", "Stack #{service.stack_name} creation failed. Reason: #{err.message}")
                 end
               end

diff --git a/...loud/Orchestration/Reconfiguration/StateMachines/Methods.class/__methods__/reconfigure.rb b/...loud/Orchestration/Reconfiguration/StateMachines/Methods.class/__methods__/reconfigure.rb
@@ -13,6 +13,6 @@
 rescue => err
   $evm.root['ae_result'] = 'error'
   $evm.root['ae_reason'] = err.message
-  task.miq_request.user_message = err.message.truncate(255)
+  task.miq_request.user_message = err.message
   $evm.log("error", "Stack #{service.stack_name} update failed. Reason: #{err.message}")
 end
diff --git a/...Tower/Service/Provisioning/StateMachines/Provision.class/__methods__/check_provisioned.rb b/...Tower/Service/Provisioning/StateMachines/Provision.class/__methods__/check_provisioned.rb
@@ -32,7 +32,7 @@ def check_provisioned(task, service)
       @handle.log('error', 'Please examine job console output for more details') if @handle.root['ae_result'] == 'error'
 
       job.refresh_ems
-      task.miq_request.user_message = @handle.root['ae_reason'].truncate(255) unless @handle.root['ae_reason'].blank?
+      task.miq_request.user_message = @handle.root['ae_reason'] unless @handle.root['ae_reason'].blank?
     end
   end
 

diff --git a/.../AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__methods__/provision.rb b/.../AnsibleTower/Service/Provisioning/StateMachines/Provision.class/__methods__/provision.rb
@@ -32,7 +32,7 @@ def run(task, service)
   rescue => err
     @handle.root['ae_result'] = 'error'
     @handle.root['ae_reason'] = err.message
-    task.miq_request.user_message = err.message.truncate(255)
+    task.miq_request.user_message = err.message
     @handle.log("error", "Template #{service.job_template.name} launching failed. Reason: #{err.message}")
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ def main @@
                     end
                     unless @handle.root['ae_reason'].blank?
-                      task.miq_request.user_message = @handle.root['ae_reason'].truncate(255)
+                      task.miq_request.user_message = @handle.root['ae_reason']
                     end
                   end
@@ Expand Down @@