franz 1.5.3 → 1.5.4
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/logger.rb +8 -2
- data/lib/franz/tail.rb +17 -0
- 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: 05a395b2d10064db126d23875c069f0a4ca69ec3
|
|
4
|
+
data.tar.gz: 20fe5d0196a3172f3647161e43f8bf07638d9ae1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a629498d8e9865d1df45ba2aa9ae3cd21cd9f285057ca1684cb7b2ea47bcfda0588456c10655aa183a668f1d85f665a41f014abf4628e43aa2fb25de35af44a2
|
|
7
|
+
data.tar.gz: f0859c346bd2e5703085f790de79afb29b0ae7e68e77ae1a21291572dae304681dac6fa9d9f17b3b3e7fd0538a44a65a15f5a9a14fac1d4fa8a1a6e680824a03
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.5.
|
|
1
|
+
1.5.4
|
data/lib/franz/logger.rb
CHANGED
|
@@ -50,7 +50,10 @@ module Franz
|
|
|
50
50
|
self.formatter = proc do |severity, datetime, _, message|
|
|
51
51
|
if colorize
|
|
52
52
|
if level == 1
|
|
53
|
-
event = {
|
|
53
|
+
event = {
|
|
54
|
+
level: severity.downcase,
|
|
55
|
+
timestamp: Time.now.iso8601(6)
|
|
56
|
+
}.merge(message)
|
|
54
57
|
JSON::generate(event).colorize(
|
|
55
58
|
color: SEVERITY_COLORS[severity.to_s][0],
|
|
56
59
|
background: SEVERITY_COLORS[severity.to_s][1]
|
|
@@ -68,7 +71,10 @@ module Franz
|
|
|
68
71
|
end
|
|
69
72
|
else # plain
|
|
70
73
|
if level == 1
|
|
71
|
-
event = {
|
|
74
|
+
event = {
|
|
75
|
+
level: severity.downcase,
|
|
76
|
+
timestamp: Time.now.iso8601(6)
|
|
77
|
+
}.merge(message)
|
|
72
78
|
JSON::generate(event) + "\n"
|
|
73
79
|
else
|
|
74
80
|
long_format % [
|
data/lib/franz/tail.rb
CHANGED
|
@@ -93,6 +93,8 @@ module Franz
|
|
|
93
93
|
spread: spread
|
|
94
94
|
end
|
|
95
95
|
|
|
96
|
+
nil_reads = 0
|
|
97
|
+
|
|
96
98
|
loop do
|
|
97
99
|
break if @cursors[path] >= size
|
|
98
100
|
|
|
@@ -107,14 +109,29 @@ module Franz
|
|
|
107
109
|
# just reset the cursor and bail; hopefully we'll get a
|
|
108
110
|
# "rotated" event from Watch in the near future.
|
|
109
111
|
if data.nil?
|
|
112
|
+
nil_reads += 1
|
|
113
|
+
|
|
110
114
|
log.warn \
|
|
111
115
|
event: 'nil read',
|
|
112
116
|
path: path,
|
|
113
117
|
size: size,
|
|
114
118
|
cursor: @cursors[path],
|
|
115
119
|
spread: (size - @cursors[path])
|
|
120
|
+
|
|
121
|
+
if nil_reads >= 100
|
|
122
|
+
log.error \
|
|
123
|
+
event: 'nil read loop',
|
|
124
|
+
path: path,
|
|
125
|
+
size: size,
|
|
126
|
+
cursor: @cursors[path],
|
|
127
|
+
spread: (size - @cursors[path])
|
|
128
|
+
@cursors[path] = 0
|
|
129
|
+
return
|
|
130
|
+
end
|
|
131
|
+
|
|
116
132
|
next
|
|
117
133
|
end
|
|
134
|
+
|
|
118
135
|
data_size = data.bytesize
|
|
119
136
|
|
|
120
137
|
begin
|