mirror of
https://github.com/discourse/discourse.git
synced 2025-06-02 04:08:41 +08:00
Add rubocop to our build. (#5004)
This commit is contained in:
@ -22,7 +22,7 @@ module Scheduler
|
||||
@async = val
|
||||
end
|
||||
|
||||
def later(desc = nil, db=RailsMultisite::ConnectionManagement.current_db, &blk)
|
||||
def later(desc = nil, db = RailsMultisite::ConnectionManagement.current_db, &blk)
|
||||
if @async
|
||||
start_thread unless (@thread && @thread.alive?) || @paused
|
||||
@queue << [db, blk, desc]
|
||||
@ -43,7 +43,7 @@ module Scheduler
|
||||
|
||||
def do_all_work
|
||||
while !@queue.empty?
|
||||
do_work(_non_block=true)
|
||||
do_work(_non_block = true)
|
||||
end
|
||||
end
|
||||
|
||||
@ -61,16 +61,16 @@ module Scheduler
|
||||
end
|
||||
|
||||
# using non_block to match Ruby #deq
|
||||
def do_work(non_block=false)
|
||||
def do_work(non_block = false)
|
||||
db, job, desc = @queue.deq(non_block)
|
||||
begin
|
||||
RailsMultisite::ConnectionManagement.establish_connection(db: db) if db
|
||||
job.call
|
||||
rescue => ex
|
||||
Discourse.handle_job_exception(ex, {message: "Running deferred code '#{desc}'"})
|
||||
Discourse.handle_job_exception(ex, message: "Running deferred code '#{desc}'")
|
||||
end
|
||||
rescue => ex
|
||||
Discourse.handle_job_exception(ex, {message: "Processing deferred code queue"})
|
||||
Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
|
||||
ensure
|
||||
ActiveRecord::Base.connection_handler.clear_active_connections!
|
||||
end
|
||||
|
@ -42,13 +42,13 @@ module Scheduler
|
||||
def keep_alive
|
||||
@manager.keep_alive
|
||||
rescue => ex
|
||||
Discourse.handle_job_exception(ex, {message: "Scheduling manager keep-alive"})
|
||||
Discourse.handle_job_exception(ex, message: "Scheduling manager keep-alive")
|
||||
end
|
||||
|
||||
def reschedule_orphans
|
||||
@manager.reschedule_orphans!
|
||||
rescue => ex
|
||||
Discourse.handle_job_exception(ex, {message: "Scheduling manager orphan rescheduler"})
|
||||
Discourse.handle_job_exception(ex, message: "Scheduling manager orphan rescheduler")
|
||||
end
|
||||
|
||||
def hostname
|
||||
@ -117,7 +117,7 @@ module Scheduler
|
||||
@mutex.synchronize { info.write! }
|
||||
end
|
||||
rescue => ex
|
||||
Discourse.handle_job_exception(ex, {message: "Processing scheduled job queue"})
|
||||
Discourse.handle_job_exception(ex, message: "Processing scheduled job queue")
|
||||
ensure
|
||||
@running = false
|
||||
ActiveRecord::Base.connection_handler.clear_active_connections!
|
||||
@ -175,11 +175,11 @@ module Scheduler
|
||||
|
||||
end
|
||||
|
||||
def self.without_runner(redis=nil)
|
||||
def self.without_runner(redis = nil)
|
||||
self.new(redis, skip_runner: true)
|
||||
end
|
||||
|
||||
def initialize(redis = nil, options=nil)
|
||||
def initialize(redis = nil, options = nil)
|
||||
@redis = $redis || redis
|
||||
@random_ratio = 0.1
|
||||
unless options && options[:skip_runner]
|
||||
@ -236,7 +236,7 @@ module Scheduler
|
||||
end
|
||||
end
|
||||
|
||||
def reschedule_orphans_on!(hostname=nil)
|
||||
def reschedule_orphans_on!(hostname = nil)
|
||||
redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key|
|
||||
klass = get_klass(key)
|
||||
next unless klass
|
||||
@ -264,7 +264,7 @@ module Scheduler
|
||||
end
|
||||
end
|
||||
|
||||
def schedule_next_job(hostname=nil)
|
||||
def schedule_next_job(hostname = nil)
|
||||
(key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true
|
||||
return unless key
|
||||
|
||||
@ -310,7 +310,6 @@ module Scheduler
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def self.discover_schedules
|
||||
# hack for developemnt reloader is crazytown
|
||||
# multiple classes with same name can be in
|
||||
@ -343,7 +342,7 @@ module Scheduler
|
||||
"_scheduler_lock_"
|
||||
end
|
||||
|
||||
def self.queue_key(hostname=nil)
|
||||
def self.queue_key(hostname = nil)
|
||||
if hostname
|
||||
"_scheduler_queue_#{hostname}_"
|
||||
else
|
||||
@ -351,7 +350,7 @@ module Scheduler
|
||||
end
|
||||
end
|
||||
|
||||
def self.schedule_key(klass,hostname=nil)
|
||||
def self.schedule_key(klass, hostname = nil)
|
||||
if hostname
|
||||
"_scheduler_#{klass}_#{hostname}"
|
||||
else
|
||||
|
@ -1,13 +1,13 @@
|
||||
module Scheduler::Schedule
|
||||
|
||||
def daily(options=nil)
|
||||
def daily(options = nil)
|
||||
if options
|
||||
@daily = options
|
||||
end
|
||||
@daily
|
||||
end
|
||||
|
||||
def every(duration=nil)
|
||||
def every(duration = nil)
|
||||
if duration
|
||||
@every = duration
|
||||
if manager = Scheduler::Manager.current
|
||||
|
@ -15,8 +15,8 @@ module Scheduler
|
||||
return unless duration
|
||||
if duration < 1000
|
||||
"#{duration}ms"
|
||||
elsif duration < 60*1000
|
||||
"#{'%.2f' % (duration/1000.0)} secs"
|
||||
elsif duration < 60 * 1000
|
||||
"#{'%.2f' % (duration / 1000.0)} secs"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -24,7 +24,7 @@ module Scheduler
|
||||
app.get "/scheduler" do
|
||||
RailsMultisite::ConnectionManagement.with_connection("default") do
|
||||
@manager = Scheduler::Manager.without_runner
|
||||
@schedules = Scheduler::Manager.discover_schedules.sort do |a,b|
|
||||
@schedules = Scheduler::Manager.discover_schedules.sort do |a, b|
|
||||
a_next = a.schedule_info.next_run
|
||||
b_next = b.schedule_info.next_run
|
||||
if a_next && b_next
|
||||
@ -35,13 +35,13 @@ module Scheduler
|
||||
1
|
||||
end
|
||||
end
|
||||
erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: {view_path: VIEWS}
|
||||
erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: { view_path: VIEWS }
|
||||
end
|
||||
end
|
||||
|
||||
app.get "/scheduler/history" do
|
||||
@scheduler_stats = SchedulerStat.order('started_at desc').limit(200)
|
||||
erb File.read(File.join(VIEWS, 'history.erb')), locals: {view_path: VIEWS}
|
||||
erb File.read(File.join(VIEWS, 'history.erb')), locals: { view_path: VIEWS }
|
||||
end
|
||||
|
||||
app.post "/scheduler/:name/trigger" do
|
||||
|
Reference in New Issue
Block a user