smart_proxy_remote_execution_ssh 0.5.1 → 0.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/smart_proxy_remote_execution_ssh/plugin.rb +1 -1
- data/lib/smart_proxy_remote_execution_ssh/runners/polling_script_runner.rb +1 -1
- data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb +4 -2
- data/lib/smart_proxy_remote_execution_ssh/version.rb +1 -1
- data/lib/smart_proxy_remote_execution_ssh.rb +1 -1
- data/settings.d/remote_execution_ssh.yml.example +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1ba2217281e0dfb1199d345fd81e2e135c3b3f83e590177ecc8826dfb8176262
|
4
|
+
data.tar.gz: db341f9a3cbed3045938d16cc0b772887098ee1db4adc2d4b515449785afbf39
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4564886d08716efa9f7d40b887027d67dcd2bb9b02688033cd6f9f7f5a633a2e215ff5e567e144db687f7bb51f624b19aa240159c0f2a15ccaccbe983161c28a
|
7
|
+
data.tar.gz: fb3e8fd7bdba9193731c1399f2809e5625c6313b9cf1a1d1a6daad1e2bfc012e7057ebc7a3766e9d4bf9e1938b898dabfeea042f87db2d31b20dd07964a6744e
|
@@ -14,7 +14,7 @@ module Proxy::RemoteExecution::Ssh
|
|
14
14
|
:kerberos_auth => false,
|
15
15
|
# When set to nil, makes REX use the runner's default interval
|
16
16
|
# :runner_refresh_interval => nil,
|
17
|
-
:ssh_log_level => :
|
17
|
+
:ssh_log_level => :error,
|
18
18
|
:cleanup_working_dirs => true,
|
19
19
|
# :mqtt_broker => nil,
|
20
20
|
# :mqtt_port => nil,
|
@@ -40,7 +40,7 @@ module Proxy::RemoteExecution::Ssh::Runners
|
|
40
40
|
control_script_finish = "#{@control_script_path} init-script-finish"
|
41
41
|
<<-SCRIPT.gsub(/^ +\| /, '')
|
42
42
|
| export CONTROL_SCRIPT="#{@control_script_path}"
|
43
|
-
| sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
|
43
|
+
| #{@user_method.cli_command_prefix} sh -c '#{main_script}; #{control_script_finish}' #{close_fds} &
|
44
44
|
| echo $! > '#{@base_dir}/pid'
|
45
45
|
SCRIPT
|
46
46
|
end
|
@@ -201,8 +201,10 @@ module Proxy::RemoteExecution::Ssh::Runners
|
|
201
201
|
raise 'Control socket file does not exist' unless File.exist?(local_command_file("socket"))
|
202
202
|
@logger.debug("Sending exit request for session #{@ssh_user}@#{@host}")
|
203
203
|
args = ['/usr/bin/ssh', @host, "-o", "User=#{@ssh_user}", "-o", "ControlPath=#{local_command_file("socket")}", "-O", "exit"].flatten
|
204
|
-
*, err = session(args, in_stream: false, out_stream: false)
|
205
|
-
read_output_debug(err)
|
204
|
+
pid, *, err = session(args, in_stream: false, out_stream: false)
|
205
|
+
result = read_output_debug(err)
|
206
|
+
Process.wait(pid)
|
207
|
+
result
|
206
208
|
end
|
207
209
|
|
208
210
|
def close
|
@@ -47,7 +47,7 @@ module Proxy::RemoteExecution
|
|
47
47
|
when :ssh
|
48
48
|
Plugin.logger.warn('Deprecated option async_ssh used together with ssh mode, switching mode to ssh-async.')
|
49
49
|
Plugin.settings.mode = :'ssh-async'
|
50
|
-
when :'async
|
50
|
+
when :'ssh-async'
|
51
51
|
# This is a noop
|
52
52
|
else
|
53
53
|
Plugin.logger.warn('Deprecated option async_ssh used together with incompatible mode, ignoring.')
|
@@ -16,7 +16,7 @@
|
|
16
16
|
# Defines the verbosity of logging coming from ssh command
|
17
17
|
# one of :debug, :info, :error, :fatal
|
18
18
|
# must be lower than general log level
|
19
|
-
# :ssh_log_level:
|
19
|
+
# :ssh_log_level: error
|
20
20
|
|
21
21
|
# Remove working directories on job completion
|
22
22
|
# :cleanup_working_dirs: true
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: smart_proxy_remote_execution_ssh
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Nečas
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-02-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|