This repository was archived by the owner on Dec 15, 2021. It is now read-only.
File tree Expand file tree Collapse file tree 1 file changed +10
-8
lines changed Expand file tree Collapse file tree 1 file changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -182,18 +182,20 @@ def register
182
182
183
183
public
184
184
def run ( logstash_queue )
185
- begin
186
- run_with_catch ( logstash_queue )
185
+ $exit = false ;
186
+ run_with_catch ( logstash_queue )
187
+
188
+ while !stop?
189
+ Stud . stoppable_sleep ( @interval ) { stop? }
187
190
end
188
191
end
189
192
190
193
public
191
194
def stop
192
- @logger . warn ( "STOPPING!" )
193
-
195
+ $exit = true
194
196
exit_threads
195
197
until @queue . empty?
196
- @logger . warn ( "Flushing rest of events in logstash queue" )
198
+ @logger . log ( "Flushing rest of events in logstash queue" )
197
199
event = @queue . pop ( )
198
200
queue_event ( @parser . parse_stream ( event ) , logstash_queue , @host )
199
201
@@ -283,7 +285,7 @@ def scan(logstash_queue)
283
285
start_table_copy_thread
284
286
285
287
scan_queue = @logstash_writer . getQueue ( )
286
- while !stop?
288
+ while !$exit
287
289
event = scan_queue . take ( )
288
290
if event . getEntry ( ) . nil? and event . getSize ( ) == -1
289
291
break
@@ -294,10 +296,10 @@ def scan(logstash_queue)
294
296
295
297
private
296
298
def stream ( logstash_queue )
297
- @logger . warn ( "Starting stream..." )
299
+ @logger . log ( "Starting stream..." )
298
300
start_kcl_thread
299
301
300
- while !stop?
302
+ while !$exit
301
303
event = @queue . pop ( )
302
304
queue_event ( @parser . parse_stream ( event ) , logstash_queue , @host )
303
305
end # while true
You can’t perform that action at this time.
0 commit comments