[Groonga-commit] groonga/groonga-query-log at b731ca7 [master] Fix deadlock

Back to archive index
Kouhei Sutou null+****@clear*****
Wed Nov 7 11:56:36 JST 2018


Kouhei Sutou	2018-11-07 11:56:36 +0900 (Wed, 07 Nov 2018)

  Revision: b731ca7318de4863efe07f550b301219754e884e
  https://github.com/groonga/groonga-query-log/commit/b731ca7318de4863efe07f550b301219754e884e

  Message:
    Fix deadlock

  Modified files:
    lib/groonga-query-log/server-verifier.rb

  Modified: lib/groonga-query-log/server-verifier.rb (+3 -3)
===================================================================
--- lib/groonga-query-log/server-verifier.rb    2018-11-07 11:25:25 +0900 (50486cd)
+++ lib/groonga-query-log/server-verifier.rb    2018-11-07 11:56:36 +0900 (8b89848)
@@ -91,7 +91,7 @@ module GroongaQueryLog
           loop do
             statistic =****@queue*****
             return true if statistic.nil?
-            return true if stop?
+            next if stop?
 
             original_source = statistic.command.original_source
             begin
@@ -102,7 +102,7 @@ module GroongaQueryLog
                 $stderr.puts(original_source)
               end
               @client_error_is_occurred = true
-              retur****@optio*****_on_failure?
+              return false
             end
             if****@optio*****_cache?
               begin
@@ -113,7 +113,7 @@ module GroongaQueryLog
                   $stderr.puts("status after #{original_source}")
                 end
                 @client_error_is_occurred = true
-                retur****@optio*****_on_failure?
+                return false
               end
             end
           end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181107/bf72a526/attachment-0001.html>


More information about the Groonga-commit mailing list
Back to archive index