mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
This reverts commit 1670ffe82d.
This commit is contained in:
committed by
GitHub
parent
51a5fa036a
commit
766ff723f8
@@ -44,7 +44,6 @@ module Jobs
|
|||||||
class JobInstrumenter
|
class JobInstrumenter
|
||||||
def initialize(job_class:, opts:, db:, jid:)
|
def initialize(job_class:, opts:, db:, jid:)
|
||||||
return unless enabled?
|
return unless enabled?
|
||||||
|
|
||||||
self.class.mutex.synchronize do
|
self.class.mutex.synchronize do
|
||||||
@data = {}
|
@data = {}
|
||||||
|
|
||||||
@@ -76,7 +75,6 @@ module Jobs
|
|||||||
|
|
||||||
def stop(exception:)
|
def stop(exception:)
|
||||||
return unless enabled?
|
return unless enabled?
|
||||||
|
|
||||||
self.class.mutex.synchronize do
|
self.class.mutex.synchronize do
|
||||||
profile = MethodProfiler.stop
|
profile = MethodProfiler.stop
|
||||||
|
|
||||||
@@ -104,15 +102,30 @@ module Jobs
|
|||||||
end
|
end
|
||||||
|
|
||||||
def self.raw_log(message)
|
def self.raw_log(message)
|
||||||
|
@@logger ||=
|
||||||
begin
|
begin
|
||||||
logger << message
|
f = File.open "#{Rails.root}/log/sidekiq.log", "a"
|
||||||
rescue => e
|
f.sync = true
|
||||||
Discourse.warn_exception(e, message: "Exception encountered while logging Sidekiq job")
|
Logger.new f
|
||||||
|
end
|
||||||
|
|
||||||
|
@@log_queue ||= Queue.new
|
||||||
|
|
||||||
|
if !defined?(@@log_thread) || !@@log_thread.alive?
|
||||||
|
@@log_thread =
|
||||||
|
Thread.new do
|
||||||
|
loop do
|
||||||
|
@@logger << @@log_queue.pop
|
||||||
|
rescue Exception => e
|
||||||
|
Discourse.warn_exception(
|
||||||
|
e,
|
||||||
|
message: "Exception encountered while logging Sidekiq job",
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.logger
|
@@log_queue.push(message)
|
||||||
@@logger ||= Logger.new("#{Rails.root}/log/sidekiq.log")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_duration
|
def current_duration
|
||||||
@@ -246,7 +259,6 @@ module Jobs
|
|||||||
requeued = true
|
requeued = true
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
parent_thread = Thread.current
|
parent_thread = Thread.current
|
||||||
cluster_concurrency_redis_key = self.class.cluster_concurrency_redis_key
|
cluster_concurrency_redis_key = self.class.cluster_concurrency_redis_key
|
||||||
|
|
||||||
@@ -331,7 +343,6 @@ module Jobs
|
|||||||
keepalive_thread.join
|
keepalive_thread.join
|
||||||
self.class.clear_cluster_concurrency_lock!
|
self.class.clear_cluster_concurrency_lock!
|
||||||
end
|
end
|
||||||
|
|
||||||
ActiveRecord::Base.connection_handler.clear_active_connections!
|
ActiveRecord::Base.connection_handler.clear_active_connections!
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user