remote_syslog 1.6.6.rc2 → 1.6.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/remote_syslog.rb +1 -1
- data/lib/remote_syslog/cli.rb +1 -32
- data/remote_syslog.gemspec +2 -2
- metadata +6 -9
data/lib/remote_syslog.rb
CHANGED
data/lib/remote_syslog/cli.rb
CHANGED
@@ -222,7 +222,7 @@ module RemoteSyslog
|
|
222
222
|
def run
|
223
223
|
Thread.abort_on_exception = true
|
224
224
|
|
225
|
-
if @agent.tls && !
|
225
|
+
if @agent.tls && !EventMachine.ssl?
|
226
226
|
error "TLS is not supported by eventmachine installed on this system.\nThe openssl-devel/openssl-dev package must be installed before installing eventmachine."
|
227
227
|
end
|
228
228
|
|
@@ -254,37 +254,6 @@ module RemoteSyslog
|
|
254
254
|
@agent.redirect_io!
|
255
255
|
end
|
256
256
|
|
257
|
-
# This is a terrible hack due to the fact that eventmachine does not
|
258
|
-
# provide a way to detect if it has been compiled with TLS support
|
259
|
-
# and throws a C++ std::runtime_error if TLS is not available that we
|
260
|
-
# are unable to catch from ruby
|
261
|
-
def eventmachine_supports_tls?
|
262
|
-
rio, wio, = IO.pipe
|
263
|
-
|
264
|
-
pid = fork do
|
265
|
-
rio.close
|
266
|
-
STDOUT.reopen wio
|
267
|
-
STDERR.reopen wio
|
268
|
-
STDOUT.sync = STDERR.sync = true
|
269
|
-
EM.run_block { EventMachine.connect('0.0.0.0', 1) { |c| c.start_tls } }
|
270
|
-
end
|
271
|
-
|
272
|
-
wio.close
|
273
|
-
result = rio.read
|
274
|
-
_, status = Process.wait2(pid)
|
275
|
-
|
276
|
-
@agent.logger.debug "Results from eventmachine_supports_tls: #{status}: #{result}"
|
277
|
-
|
278
|
-
if status.exitstatus == 0
|
279
|
-
return true
|
280
|
-
elsif result =~ /Encryption not available/
|
281
|
-
return false
|
282
|
-
else
|
283
|
-
# We'll assume we can work if the problem wasn't related to encryption
|
284
|
-
return true
|
285
|
-
end
|
286
|
-
end
|
287
|
-
|
288
257
|
|
289
258
|
def error(message, try_help = false)
|
290
259
|
puts "#{program_name}: #{message}"
|
data/remote_syslog.gemspec
CHANGED
@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
|
|
8
8
|
## If your rubyforge_project name is different, then edit it and comment out
|
9
9
|
## the sub! line in the Rakefile
|
10
10
|
s.name = 'remote_syslog'
|
11
|
-
s.version = '1.6.6
|
12
|
-
s.date = '2012-08-
|
11
|
+
s.version = '1.6.6'
|
12
|
+
s.date = '2012-08-14'
|
13
13
|
s.rubyforge_project = 'remote_syslog'
|
14
14
|
|
15
15
|
## Make sure your summary is short. The description may be as long
|
metadata
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: remote_syslog
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
prerelease:
|
4
|
+
prerelease: false
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 6
|
8
8
|
- 6
|
9
|
-
|
10
|
-
version: 1.6.6.rc2
|
9
|
+
version: 1.6.6
|
11
10
|
platform: ruby
|
12
11
|
authors:
|
13
12
|
- Troy Davis
|
@@ -16,7 +15,7 @@ autorequire:
|
|
16
15
|
bindir: bin
|
17
16
|
cert_chain: []
|
18
17
|
|
19
|
-
date: 2012-08-
|
18
|
+
date: 2012-08-14 00:00:00 -07:00
|
20
19
|
default_executable: remote_syslog
|
21
20
|
dependencies:
|
22
21
|
- !ruby/object:Gem::Dependency
|
@@ -152,13 +151,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
152
151
|
version: "0"
|
153
152
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
154
153
|
requirements:
|
155
|
-
- - "
|
154
|
+
- - ">="
|
156
155
|
- !ruby/object:Gem::Version
|
157
156
|
segments:
|
158
|
-
-
|
159
|
-
|
160
|
-
- 1
|
161
|
-
version: 1.3.1
|
157
|
+
- 0
|
158
|
+
version: "0"
|
162
159
|
requirements: []
|
163
160
|
|
164
161
|
rubyforge_project: remote_syslog
|