X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6bb345e5958f905e0527facdc5b08d973a535f3a..deb104b3706fab06bf21a70fb9d85d2717f4f0c1:/services/api/lib/audit_logs.rb

diff --git a/services/api/lib/audit_logs.rb b/services/api/lib/audit_logs.rb
index 886c887389..2b5e3b8abf 100644
--- a/services/api/lib/audit_logs.rb
+++ b/services/api/lib/audit_logs.rb
@@ -62,7 +62,12 @@ module AuditLogs
       rescue => e
         Rails.logger.error "#{e.class}: #{e}\n#{e.backtrace.join("\n\t")}"
       ensure
-        ActiveRecord::Base.connection.close
+        # Rails 5.1+ makes test threads share a database connection, so we can't
+        # close a connection shared with other threads.
+        # https://github.com/rails/rails/commit/deba47799ff905f778e0c98a015789a1327d5087
+        if Rails.env != "test"
+          ActiveRecord::Base.connection.close
+        end
       end
     end
   end