Merge pull request #18214 from NickLaMuro/remove_open_4

Remove Open4 gem
ManageIQ · Nov 19, 2018 · ed3875f · ed3875f
2 parents dd6a3e2 + 835c8cd
commit ed3875f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -152,10 +152,6 @@ group :google, :openshift, :manageiq_default do
   gem "sshkey",                         "~>1.8.0",       :require => false
 end
 
-group :automate, :cockpit, :manageiq_default do
-  gem "open4",                          "~>1.3.0",       :require => false
-end
-
 ### end of provider bundler groups
 
 group :automate, :seed, :manageiq_default do

diff --git a/app/models/miq_cockpit_ws_worker/runner.rb b/app/models/miq_cockpit_ws_worker/runner.rb
@@ -143,16 +143,16 @@ def cockpit_ws_run
     cockpit_ws = MiqCockpit::WS.new(opts)
     cockpit_ws.save_config
 
-    require 'open4'
+    require "open3"
     env = {
       "XDG_CONFIG_DIRS" => cockpit_ws.config_dir,
       "DRB_URI"         => @drb_uri
     }
-    pid, stdin, stdout, stderr = Open4.popen4(env, *cockpit_ws.command(BINDING_ADDRESS))
+    stdin, stdout, stderr, wait_thr = Open3.popen3(env, *cockpit_ws.command(BINDING_ADDRESS))
     stdin.close
 
     _log.info("#{log_prefix} cockpit-ws process started - pid=#{pid}")
-    return pid, stdout, stderr
+    return wait_thr.pid, stdout, stderr
   end
 
   def check_drb_service