From 02c5d6376ef3f3741b7bd57808fe3b5d9fea0857 Mon Sep 17 00:00:00 2001
From: NickLaMuro <nicklamuro@gmail.com>
Date: Tue, 11 Feb 2020 11:35:08 -0600
Subject: [PATCH] [miq_memcached.rb] Use AwesomeSpawn::CommandResultError for
 rescue

Fixes a bug introduced by changing Miq.runcmd to use AwesomeSpawn to get
a proper output from the error instead of what was generated by
awesomespawn (which is the CMD + the existatus)
---
 lib/miq_memcached.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/miq_memcached.rb b/lib/miq_memcached.rb
index b9868dfce84..ab64cb82010 100644
--- a/lib/miq_memcached.rb
+++ b/lib/miq_memcached.rb
@@ -128,14 +128,16 @@ def self.restart!(opts = {})
 
     def self.killall
       MiqUtil.runcmd("killall -9 memcached")
-    rescue => err
-      raise unless err.to_s =~ /memcached: no process/
+    rescue AwesomeSpawn::CommandResultError => err
+      raise unless err.result.output =~ /memcached: no process/
     end
 
     def self.status
       begin
         res = MiqUtil.runcmd('service memcached status').to_s.chomp
-      rescue RuntimeError => err
+      rescue AwesomeSpawn::CommandResultError => err
+        return false, err.result.output.chomp
+      rescue => err
         return false, err.to_s.chomp
       else
         return true, res