franz 1.4.23 → 1.4.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/franz/agg.rb +1 -1
- data/lib/franz/tail.rb +13 -6
- data/lib/franz/watch.rb +3 -3
- 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: 91e29b5de32dbabf1ba04e9c05d8b3c2e3d3ba70
|
|
4
|
+
data.tar.gz: 5aa04ef782365e75fe668989159f68bbc50baf20
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ce76ceaa3107145ab662a6388a6dfdd919189ed8367797d0dd84150239248116098e08ca34c7edf23a5cadc0caddb141ea0cd17e01796ed792efd82350cd4f21
|
|
7
|
+
data.tar.gz: b969d0727dd30f917fd81c5c7d770ef8e499f871cb3ca4e848fc87f1c15ac815f4b1117edfafbd9984e5f69102909b525a67090c8979b948999246fe02138688
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.4.
|
|
1
|
+
1.4.24
|
data/lib/franz/agg.rb
CHANGED
data/lib/franz/tail.rb
CHANGED
|
@@ -65,7 +65,7 @@ module Franz
|
|
|
65
65
|
|
|
66
66
|
def checkin now=Time.now
|
|
67
67
|
if @last_checkin < now - @checkin_interval
|
|
68
|
-
log.
|
|
68
|
+
log.warn event: 'checkin', cursors_size: @cursors.length
|
|
69
69
|
@last_checkin = now
|
|
70
70
|
end
|
|
71
71
|
end
|
|
@@ -78,18 +78,24 @@ module Franz
|
|
|
78
78
|
@cursors[path] ||= 0
|
|
79
79
|
spread = size - @cursors[path]
|
|
80
80
|
if spread > @read_limit
|
|
81
|
-
log.
|
|
81
|
+
log.warn event: 'large read', path: path, spread: spread
|
|
82
82
|
end
|
|
83
83
|
loop do
|
|
84
84
|
break if @cursors[path] >= size
|
|
85
85
|
|
|
86
86
|
begin
|
|
87
87
|
data = IO::read path, @block_size, @cursors[path]
|
|
88
|
+
if data.nil?
|
|
89
|
+
log.fatal event: 'nil read', path: path
|
|
90
|
+
next
|
|
91
|
+
end
|
|
88
92
|
size = data.bytesize
|
|
89
93
|
buffer[path].extract(data).each do |line|
|
|
90
94
|
tail_events.push path: path, line: line
|
|
91
95
|
end
|
|
92
96
|
@cursors[path] += size
|
|
97
|
+
rescue RuntimeError
|
|
98
|
+
log.fatal event: 'buffer full', path: path
|
|
93
99
|
rescue EOFError, Errno::ENOENT
|
|
94
100
|
# we're done here
|
|
95
101
|
end
|
|
@@ -111,20 +117,21 @@ module Franz
|
|
|
111
117
|
when :created
|
|
112
118
|
# nop
|
|
113
119
|
when :replaced
|
|
114
|
-
log.
|
|
120
|
+
log.warn event: 'replaced', raw: event
|
|
115
121
|
close event[:path]
|
|
116
122
|
read event[:path], event[:size]
|
|
117
123
|
when :truncated
|
|
118
|
-
log.
|
|
124
|
+
log.warn event: 'truncated', raw: event
|
|
119
125
|
close event[:path]
|
|
120
126
|
read event[:path], event[:size]
|
|
121
127
|
when :appended
|
|
122
128
|
read event[:path], event[:size]
|
|
123
129
|
when :deleted
|
|
124
|
-
log.
|
|
130
|
+
log.warn event: 'deleted', raw: event
|
|
125
131
|
close event[:path]
|
|
126
132
|
else
|
|
127
|
-
|
|
133
|
+
log.warn event: 'invalid event', raw: event
|
|
134
|
+
exit 2
|
|
128
135
|
end
|
|
129
136
|
return event[:path]
|
|
130
137
|
end
|
data/lib/franz/watch.rb
CHANGED
|
@@ -109,18 +109,18 @@ module Franz
|
|
|
109
109
|
if file_created? old_stat, stat
|
|
110
110
|
# enqueue :created, path
|
|
111
111
|
elsif file_deleted? old_stat, stat
|
|
112
|
-
log.
|
|
112
|
+
log.warn event: 'deleted!', path: path
|
|
113
113
|
enqueue :deleted, path
|
|
114
114
|
deleted << path
|
|
115
115
|
end
|
|
116
116
|
|
|
117
117
|
if file_replaced? old_stat, stat
|
|
118
|
-
log.
|
|
118
|
+
log.warn event: 'replaced!', path: path
|
|
119
119
|
enqueue :replaced, path, stat[:size]
|
|
120
120
|
elsif file_appended? old_stat, stat
|
|
121
121
|
enqueue :appended, path, stat[:size]
|
|
122
122
|
elsif file_truncated? old_stat, stat
|
|
123
|
-
log.
|
|
123
|
+
log.warn event: 'truncated!', path: path
|
|
124
124
|
enqueue :truncated, path, stat[:size]
|
|
125
125
|
end
|
|
126
126
|
end
|