franz 1.5.8 → 1.5.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/franz/input.rb +2 -1
- data/lib/franz/logger.rb +5 -2
- data/lib/franz/tail.rb +10 -10
- data/lib/franz/watch.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f1b893a08216930ae54c7bc089190ced39575a27
|
4
|
+
data.tar.gz: a7bc30fcd0e71b6a0305f1532e1917e44898672e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 47c16c78ba9ee896c7e4628fb5e58ac93cb7ce51b8a707e3a275318b799179abeae57d60ff97d36405188e47ab3134bd0dbd2784dbeea81146f19467fe141193
|
7
|
+
data.tar.gz: 5c8a3783775c21e0c43d3f2b96f7e5cb27b7eed0dafc05fa5d7bfe5508f768df29e33eec983b335cb1fc62999767edf142f44130c1f08309e185916bb53f93fc
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.5.
|
1
|
+
1.5.9
|
data/lib/franz/input.rb
CHANGED
@@ -102,7 +102,8 @@ module Franz
|
|
102
102
|
watch_interval: opts[:input][:watch_interval],
|
103
103
|
play_catchup?: opts[:input][:play_catchup?],
|
104
104
|
logger: opts[:logger],
|
105
|
-
stats: stats
|
105
|
+
stats: stats,
|
106
|
+
cursors: cursors
|
106
107
|
|
107
108
|
@tail = Franz::Tail.new \
|
108
109
|
input_config: ic,
|
data/lib/franz/logger.rb
CHANGED
@@ -50,10 +50,13 @@ module Franz
|
|
50
50
|
|
51
51
|
message = { message: message } unless message.is_a? Hash
|
52
52
|
|
53
|
-
event =
|
53
|
+
event = message.merge \
|
54
54
|
'level' => severity,
|
55
55
|
'@timestamp' => datetime.iso8601(3)
|
56
|
-
|
56
|
+
|
57
|
+
unless level == ::Logger::INFO
|
58
|
+
event.merge! marker: File::basename(caller[4])
|
59
|
+
end
|
57
60
|
|
58
61
|
if colorize # console output
|
59
62
|
event = JSON::pretty_generate(event) + "\n"
|
data/lib/franz/tail.rb
CHANGED
@@ -74,9 +74,10 @@ module Franz
|
|
74
74
|
@cursors[path] ||= 0
|
75
75
|
spread = size - @cursors[path]
|
76
76
|
|
77
|
-
|
78
|
-
|
79
|
-
|
77
|
+
# Not convinced this would ever happen...
|
78
|
+
if spread < 0
|
79
|
+
log.error \
|
80
|
+
event: 'negative spread',
|
80
81
|
path: path,
|
81
82
|
size: size,
|
82
83
|
cursor: @cursors[path],
|
@@ -102,15 +103,17 @@ module Franz
|
|
102
103
|
data = nil
|
103
104
|
end
|
104
105
|
|
105
|
-
if data.nil?
|
106
|
+
if data.nil?
|
107
|
+
# Not so sure of myself here: It's been truncated, it's been rotated,
|
108
|
+
# or else it no longer exists. We "return" in hopes that a :truncated,
|
109
|
+
# :rotated, :deleted event comes along soon after. If it doesn't...
|
106
110
|
log.warn \
|
107
111
|
event: 'nil read',
|
108
112
|
path: path,
|
109
113
|
size: size,
|
110
114
|
cursor: @cursors[path],
|
111
115
|
spread: (size - @cursors[path])
|
112
|
-
|
113
|
-
next
|
116
|
+
return
|
114
117
|
end
|
115
118
|
|
116
119
|
data_size = data.bytesize
|
@@ -154,10 +157,7 @@ module Franz
|
|
154
157
|
event: 'handle',
|
155
158
|
raw: event
|
156
159
|
case event[:name]
|
157
|
-
when :replaced
|
158
|
-
close event[:path]
|
159
|
-
read event[:path], event[:size]
|
160
|
-
when :truncated
|
160
|
+
when :replaced, :truncated
|
161
161
|
close event[:path]
|
162
162
|
read event[:path], event[:size]
|
163
163
|
when :appended
|
data/lib/franz/watch.rb
CHANGED