smart_proxy_remote_execution_ssh 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2515f08b67e5b567e50182d278d73d2db8466e7a12cb6e8000ad8e4f8ce6bf65
-  data.tar.gz: 686ba55bf862fc81f3154ebadbaafa3702416109e81641bdcb2442873c5a451b
+  metadata.gz: 1ba2217281e0dfb1199d345fd81e2e135c3b3f83e590177ecc8826dfb8176262
+  data.tar.gz: db341f9a3cbed3045938d16cc0b772887098ee1db4adc2d4b515449785afbf39
 SHA512:
-  metadata.gz: 9f9e84c78cab2997b711ee559440ad9323c6c3605726f6360a94415ccda3f7a08db0450fba8fe5479e06b649a8e6e8e545be72f35751762c50bf8ef5bc32696e
-  data.tar.gz: 0705716e01985cd8b5a3aa2ffd4104f6d4ce0938dc8a0e9b105f65f149d62c1c030916250cf0f1c35ed51bfaceb36964d0b959e5e13f42c70fb0a42389a01a2e
+  metadata.gz: 4564886d08716efa9f7d40b887027d67dcd2bb9b02688033cd6f9f7f5a633a2e215ff5e567e144db687f7bb51f624b19aa240159c0f2a15ccaccbe983161c28a
+  data.tar.gz: fb3e8fd7bdba9193731c1399f2809e5625c6313b9cf1a1d1a6daad1e2bfc012e7057ebc7a3766e9d4bf9e1938b898dabfeea042f87db2d31b20dd07964a6744e

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -14,7 +14,7 @@ module Proxy::RemoteExecution::Ssh
                      :kerberos_auth           => false,
                      # When set to nil, makes REX use the runner's default interval
                      # :runner_refresh_interval => nil,
-                     :ssh_log_level           => :fatal,
+                     :ssh_log_level           => :error,
                      :cleanup_working_dirs    => true,
                      # :mqtt_broker             => nil,
                      # :mqtt_port               => nil,

data/lib/smart_proxy_remote_execution_ssh/runners/polling_script_runner.rb

@@ -40,7 +40,7 @@ module Proxy::RemoteExecution::Ssh::Runners
       control_script_finish = "#{@control_script_path} init-script-finish"
       <<-SCRIPT.gsub(/^ +\| /, '')
       | export CONTROL_SCRIPT="#{@control_script_path}"
-      | sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
+      | #{@user_method.cli_command_prefix} sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
       | echo $! > '#{@base_dir}/pid'
       SCRIPT
     end

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -201,8 +201,10 @@ module Proxy::RemoteExecution::Ssh::Runners
       raise 'Control socket file does not exist' unless File.exist?(local_command_file("socket"))
       @logger.debug("Sending exit request for session #{@ssh_user}@#{@host}")
       args = ['/usr/bin/ssh', @host, "-o", "User=#{@ssh_user}", "-o", "ControlPath=#{local_command_file("socket")}", "-O", "exit"].flatten
-      *, err = session(args, in_stream: false, out_stream: false)
-      read_output_debug(err)
+      pid, *, err = session(args, in_stream: false, out_stream: false)
+      result = read_output_debug(err)
+      Process.wait(pid)
+      result
     end
 
     def close

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.5.1'
+      VERSION = '0.5.2'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -47,7 +47,7 @@ module Proxy::RemoteExecution
           when :ssh
             Plugin.logger.warn('Deprecated option async_ssh used together with ssh mode, switching mode to ssh-async.')
             Plugin.settings.mode = :'ssh-async'
-          when :'async-ssh'
+          when :'ssh-async'
             # This is a noop
           else
             Plugin.logger.warn('Deprecated option async_ssh used together with incompatible mode, ignoring.')

data/settings.d/remote_execution_ssh.yml.example

@@ -16,7 +16,7 @@
 # Defines the verbosity of logging coming from ssh command
 # one of :debug, :info, :error, :fatal
 # must be lower than general log level
-# :ssh_log_level: fatal
+# :ssh_log_level: error
 
 # Remove working directories on job completion
 # :cleanup_working_dirs: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler