logstash-core 1.5.0.rc1-java → 1.5.0.rc2-java
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of logstash-core might be problematic. Click here for more details.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9e7eb61ec148650d979bffdf8c4642ebace2b333
|
4
|
+
data.tar.gz: 2b81cce46d0432cb99cdf3853dc5baac44773411
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2b9c60fc16d3a1522c6d5a69ab06173501f9668feb8ecb3d0c4cc7275c6bc488e80333fe17035e4fa903ef4e4d5893c87150a56f9dc179873680398fd978d3ff
|
7
|
+
data.tar.gz: 70450f11d30824b347a337082e741582a35a29d54466fe8ebff3c0058f0f9542f6a7fbc1176e68bb6a189915967d36c20ff0e122f91085f83d6fafba437139e1
|
@@ -451,7 +451,7 @@ module LogStash::Config::Mixin
|
|
451
451
|
return false, "Expected password (one value), got #{value.size} values?"
|
452
452
|
end
|
453
453
|
|
454
|
-
result = ::LogStash::Util::Password.new(value.first)
|
454
|
+
result = value.first.is_a?(::LogStash::Util::Password) ? value.first : ::LogStash::Util::Password.new(value.first)
|
455
455
|
when :path
|
456
456
|
if value.size > 1 # Only 1 value wanted
|
457
457
|
return false, "Expected path (one value), got #{value.size} values?"
|
data/lib/logstash/gemfile.rb
CHANGED
@@ -15,12 +15,6 @@ module LogStash
|
|
15
15
|
@gemset = nil
|
16
16
|
end
|
17
17
|
|
18
|
-
def self.open(file_path)
|
19
|
-
gemfile = new(::File.new(file_path, "r+"))
|
20
|
-
gemfile.load
|
21
|
-
gemfile
|
22
|
-
end
|
23
|
-
|
24
18
|
def load
|
25
19
|
@gemset ||= DSL.parse(@io.read)
|
26
20
|
self
|
@@ -57,11 +51,6 @@ module LogStash
|
|
57
51
|
def remove(name)
|
58
52
|
@gemset.remove_gem(name)
|
59
53
|
end
|
60
|
-
|
61
|
-
def close
|
62
|
-
save if @gemset
|
63
|
-
@io.close
|
64
|
-
end
|
65
54
|
end
|
66
55
|
|
67
56
|
class Gemset
|
@@ -32,7 +32,7 @@ class LogStash::PluginManager::Install < Clamp::Command
|
|
32
32
|
end
|
33
33
|
raise(LogStash::PluginManager::Error, "File #{LogStash::Environment::GEMFILE_PATH} does not exist or is not writable, aborting") unless File.writable?(LogStash::Environment::GEMFILE_PATH)
|
34
34
|
|
35
|
-
gemfile = LogStash::Gemfile.
|
35
|
+
gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
|
36
36
|
# keep a copy of the gemset to revert on error
|
37
37
|
original_gemset = gemfile.gemset.copy
|
38
38
|
|
@@ -58,8 +58,17 @@ class LogStash::PluginManager::Install < Clamp::Command
|
|
58
58
|
end if verify?
|
59
59
|
|
60
60
|
# at this point we know that we either have a valid gem name & version or a valid .gem file path
|
61
|
+
|
62
|
+
# if LogStash::PluginManager.plugin_file?(plugin)
|
63
|
+
# raise(LogStash::PluginManager::Error) unless cache_gem_file(plugin)
|
64
|
+
# spec = LogStash::PluginManager.plugin_file_spec(plugin)
|
65
|
+
# gemfile.update(spec.name, spec.version.to_s)
|
66
|
+
# else
|
67
|
+
# plugins.each{|tuple| gemfile.update(*tuple)}
|
68
|
+
# end
|
61
69
|
end
|
62
70
|
|
71
|
+
|
63
72
|
install_list = LogStash::PluginManager.merge_duplicates(install_list)
|
64
73
|
install_list.each{|plugin, version| gemfile.update(plugin, version)}
|
65
74
|
gemfile.save
|
@@ -85,9 +94,6 @@ class LogStash::PluginManager::Install < Clamp::Command
|
|
85
94
|
end
|
86
95
|
|
87
96
|
puts("Installation successful")
|
88
|
-
|
89
|
-
ensure
|
90
|
-
gemfile.close if gemfile
|
91
97
|
end
|
92
98
|
|
93
99
|
# copy .gem file into bundler cache directory, log any error to $stderr
|
@@ -15,7 +15,7 @@ class LogStash::PluginManager::Uninstall < Clamp::Command
|
|
15
15
|
def execute
|
16
16
|
raise(LogStash::PluginManager::Error, "File #{LogStash::Environment::GEMFILE_PATH} does not exist or is not writable, aborting") unless File.writable?(LogStash::Environment::GEMFILE_PATH)
|
17
17
|
|
18
|
-
gemfile = LogStash::Gemfile.
|
18
|
+
gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
|
19
19
|
# keep a copy of the gemset to revert on error
|
20
20
|
original_gemset = gemfile.gemset.copy
|
21
21
|
|
@@ -45,7 +45,5 @@ class LogStash::PluginManager::Uninstall < Clamp::Command
|
|
45
45
|
raise(LogStash::PluginManager::Error, "Uninstall aborted")
|
46
46
|
end
|
47
47
|
end
|
48
|
-
ensure
|
49
|
-
gemfile.close if gemfile
|
50
48
|
end
|
51
49
|
end
|
@@ -12,7 +12,7 @@ class LogStash::PluginManager::Update < Clamp::Command
|
|
12
12
|
parameter "[PLUGIN] ...", "Plugin name(s) to upgrade to latest version"
|
13
13
|
|
14
14
|
def execute
|
15
|
-
gemfile = LogStash::Gemfile.
|
15
|
+
gemfile = LogStash::Gemfile.new(File.new(LogStash::Environment::GEMFILE_PATH, "r+")).load
|
16
16
|
# keep a copy of the gemset to revert on error
|
17
17
|
original_gemset = gemfile.gemset.copy
|
18
18
|
|
@@ -60,8 +60,6 @@ class LogStash::PluginManager::Update < Clamp::Command
|
|
60
60
|
end
|
61
61
|
end
|
62
62
|
puts("No plugin updated") if update_count.zero?
|
63
|
-
ensure
|
64
|
-
gemfile.close
|
65
63
|
end
|
66
64
|
|
67
65
|
private
|
data/lib/logstash/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.0.
|
4
|
+
version: 1.5.0.rc2
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Jordan Sissel
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2015-03-
|
13
|
+
date: 2015-03-06 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: cabin
|