logstash-input-paho-mqtt 0.1.4 → 0.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/logstash/inputs/mqtt.rb +5 -7
- data/logstash-input-mqtt.gemspec +2 -2
- metadata +4 -5
- data/lib/logstash/inputs/mqtt/logstash_mqtt.rb +0 -53
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6d749cd9742fb0b3e08e19e79c02da6dc5efa6b1e43ee126e9b9d3439393818a
|
4
|
+
data.tar.gz: de0e1558ce428a8db0bcec19452e474bf2e46bd356815df89982766e60146fb6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4a78a54c9d99168e432b1b2d57e3da9ac7133bf4cb2fe033daa7cbb127b5f12d7cf21ac085894b374e996f89909c6ac4187af338ceb11dbadc0e6bd068eebb16
|
7
|
+
data.tar.gz: e40d79b8744fa61b8ede849d2865955aadc210356b4b32afd1078cfa7536b0f9817ef7b14fb72385b30a393310b9ef4c9339cc94fd7449709373da12debe0a8b
|
data/lib/logstash/inputs/mqtt.rb
CHANGED
@@ -9,8 +9,6 @@ require 'paho-mqtt'
|
|
9
9
|
# This plugin is intented only as an example.
|
10
10
|
|
11
11
|
class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
|
12
|
-
require "logstash/inputs/mqtt/logstash_mqtt"
|
13
|
-
|
14
12
|
config_name 'mqtt'
|
15
13
|
|
16
14
|
# If undefined, Logstash will complain, even if codec is unused.
|
@@ -32,7 +30,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
|
|
32
30
|
config :will_qos, :validate => :string, :default => 0
|
33
31
|
config :will_retain, :validate => :boolean, :default => false
|
34
32
|
config :persistent, :validate => :boolean, :default => true
|
35
|
-
config :logfile, :validate => :string, :default =>
|
33
|
+
config :logfile, :validate => :string, :default => '/dev/stdout'
|
36
34
|
config :log_level, :validate => :string, :default => 'ERROR'
|
37
35
|
config :reconnect_retries, :validate => :number, :default => -1 #-1 infinite loop
|
38
36
|
config :reconnect_sleep_time, :validate => :number, :default => 5
|
@@ -50,7 +48,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
|
|
50
48
|
#levels: DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN
|
51
49
|
PahoMqtt.logger.level = @log_level unless @logfile.nil?
|
52
50
|
|
53
|
-
@client =
|
51
|
+
@client = PahoMqtt::Client.new({
|
54
52
|
:host => @host,
|
55
53
|
:port => @port,
|
56
54
|
:persistent => @persistent, # keep connection persistent
|
@@ -64,8 +62,8 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
|
|
64
62
|
:will_payload => @will_payload,
|
65
63
|
:will_qos => @will_qos,
|
66
64
|
:will_retain => @will_retain,
|
67
|
-
:
|
68
|
-
|
65
|
+
:reconnect_limit => @reconnect_retries,
|
66
|
+
:reconnect_delay => @reconnect_sleep_time,
|
69
67
|
})
|
70
68
|
|
71
69
|
if @ssl
|
@@ -91,7 +89,7 @@ class LogStash::Inputs::Mqtt < LogStash::Inputs::Base
|
|
91
89
|
rescue PahoMqtt::Exception => e
|
92
90
|
@logger.warn("Error while setting up connection for MQTT broker! Retrying.",
|
93
91
|
:message => e.message,
|
94
|
-
|
92
|
+
:class => e.class.name,
|
95
93
|
:location => e.backtrace.first
|
96
94
|
)
|
97
95
|
Stud.stoppable_sleep(1) { stop? }
|
data/logstash-input-mqtt.gemspec
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
Gem::Specification.new do |s|
|
2
2
|
s.name = 'logstash-input-paho-mqtt'
|
3
|
-
s.version = '0.1.
|
3
|
+
s.version = '0.1.5'
|
4
4
|
s.licenses = ['Apache-2.0']
|
5
5
|
s.summary = 'Logstash MQTT input plugin.'
|
6
6
|
s.homepage = 'https://github.com/jurek7/logstash-input-mqtt'
|
@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
|
|
19
19
|
# Gem dependencies
|
20
20
|
s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
|
21
21
|
s.add_runtime_dependency 'logstash-codec-plain'
|
22
|
-
s.add_runtime_dependency 'paho-mqtt', '>= 1.0.
|
22
|
+
s.add_runtime_dependency 'paho-mqtt', '>= 1.0.12'
|
23
23
|
s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
|
24
24
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: logstash-input-paho-mqtt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- juri
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-06-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
requirements:
|
44
44
|
- - ">="
|
45
45
|
- !ruby/object:Gem::Version
|
46
|
-
version: 1.0.
|
46
|
+
version: 1.0.12
|
47
47
|
name: paho-mqtt
|
48
48
|
prerelease: false
|
49
49
|
type: :runtime
|
@@ -51,7 +51,7 @@ dependencies:
|
|
51
51
|
requirements:
|
52
52
|
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.0.
|
54
|
+
version: 1.0.12
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
requirement: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
@@ -79,7 +79,6 @@ files:
|
|
79
79
|
- LICENSE
|
80
80
|
- README.md
|
81
81
|
- lib/logstash/inputs/mqtt.rb
|
82
|
-
- lib/logstash/inputs/mqtt/logstash_mqtt.rb
|
83
82
|
- logstash-input-mqtt.gemspec
|
84
83
|
- spec/inputs/mqtt_spec.rb
|
85
84
|
homepage: https://github.com/jurek7/logstash-input-mqtt
|
@@ -1,53 +0,0 @@
|
|
1
|
-
require "paho-mqtt"
|
2
|
-
require "logger"
|
3
|
-
|
4
|
-
module LogStash
|
5
|
-
module Inputs
|
6
|
-
class Mqtt
|
7
|
-
class RecoverableMqttClient < PahoMqtt::Client
|
8
|
-
|
9
|
-
attr_accessor :retry_reconnection_max_count
|
10
|
-
attr_accessor :retry_reconnection_sleep_time
|
11
|
-
|
12
|
-
def initialize(*args)
|
13
|
-
@retry_reconnection_max_count = 3
|
14
|
-
@retry_reconnection_sleep_time = 5
|
15
|
-
@stop_connection = false
|
16
|
-
super(*args)
|
17
|
-
end
|
18
|
-
|
19
|
-
def reconnect
|
20
|
-
@reconnect_thread = Thread.new do
|
21
|
-
retries = @retry_reconnection_max_count
|
22
|
-
while retries != 0 do
|
23
|
-
retries -= 1 unless retry_reconnection_max_count < 0
|
24
|
-
if @stop
|
25
|
-
PahoMqtt.logger.warn("RecoverableClient::Reconnection attempt is over due to stop request.") if PahoMqtt.logger?
|
26
|
-
disconnect(false)
|
27
|
-
exit(1)
|
28
|
-
break
|
29
|
-
end
|
30
|
-
PahoMqtt.logger.debug("RecoverableClient::New reconnect attempt...remaining retries #{retries}") if PahoMqtt.logger?
|
31
|
-
connect
|
32
|
-
if connected?
|
33
|
-
break
|
34
|
-
else
|
35
|
-
sleep @retry_reconnection_sleep_time
|
36
|
-
end
|
37
|
-
end
|
38
|
-
unless connected?
|
39
|
-
PahoMqtt.logger.error("RecoverableClient::Reconnection attempt counter is over.(#{@retry_reconnection_max_count} times)") if PahoMqtt.logger?
|
40
|
-
disconnect(false)
|
41
|
-
exit(1)
|
42
|
-
end
|
43
|
-
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
def stop
|
48
|
-
@stop_connection = true
|
49
|
-
end
|
50
|
-
end #class RecoverableMqttClient
|
51
|
-
end #class Mqtt
|
52
|
-
end #module Inputs
|
53
|
-
end #module LogStash
|