提交: 6f2e8ef61c84c48e99a058b072171d5df6751e7a - mmw_serv (git)

Commit MetaInfo

• 修订版: 6f2e8ef61c84c48e99a058b072171d5df6751e7a (tree)
• 时间: 2017-08-31 01:17:44
• 作者: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Add crono for scheduled cleanup.

更改概述

• modified: Gemfile
• modified: Gemfile.lock
• modified: Procfile
• add: Procfile.job
• add: config/cronotab.rb
• modified: config/deploy/docker-production.rb
• modified: config/deploy/docker-staging.rb
• modified: config/routes.rb
• add: db/migrate/20170830152444_create_crono_jobs.rb
• modified: db/schema.rb
• add: lib/tasks/cleanup_dist_signals.rake

差异

--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,8 @@ gem 'paperclip'
 gem 'rqrcode', github: 'sugi/rqrcode', branch: 'inline-svg'
 gem 'rubyzip', '>= 1.0.0', require: 'zip'
 #gem 'counter_culture', '~> 1.0'
+gem 'crono'
+gem 'sinatra', '>= 2.0.0', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,6 +109,9 @@ GEM
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crono (1.1.2)
+      activerecord (>= 4.0)
+      activesupport (>= 4.0)
     daemons (1.2.4)
     database_cleaner (1.6.1)
     debug_inspector (0.0.3)
@@ -229,6 +232,7 @@ GEM
     minitest (5.10.3)
     multi_json (1.12.1)
     multipart-post (2.0.0)
+    mustermann (1.0.0)
     mysql2 (0.4.8)
     nenv (0.3.0)
     net-scp (1.2.1)
@@ -273,6 +277,8 @@ GEM
     public_suffix (2.0.5)
     puma (3.9.1)
     rack (2.0.3)
+    rack-protection (2.0.0)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.1.3)
@@ -359,6 +365,11 @@ GEM
     simple_form (3.5.0)
       actionpack (> 4, < 5.2)
       activemodel (> 4, < 5.2)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     slop (3.6.0)
     spring (2.0.2)
       activesupport (>= 4.2)
@@ -435,6 +446,7 @@ DEPENDENCIES
   capistrano-rails
   capybara (~> 2.13)
   coffee-rails (~> 4.2)
+  crono
   daemons
   database_cleaner
   delayed_job_active_record
@@ -477,6 +489,7 @@ DEPENDENCIES
   sdoc (~> 0.4.0)
   selenium-webdriver
   simple_form
+  sinatra (>= 2.0.0)
   spring
   spring-commands-rspec
   spring-watcher-listen (~> 2.0.0)

--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,3 @@
+# Procfile for develoment servers
 web: bundle exec bin/rails s -b 0 -p 3000
 webpack: bundle exec bin/webpack-dev-server --host 0.0.0.0

--- /dev/null
+++ b/Procfile.job
@@ -0,0 +1,3 @@
+# Procfile for job workers
+crono: bundle exec crono run
+job: bundle exec bin/delayed_job run

--- /dev/null
+++ b/config/cronotab.rb
@@ -0,0 +1,34 @@
+# cronotab.rb — Crono configuration file
+#
+# Here you can specify periodic jobs and schedule.
+# You can use ActiveJob's jobs from `app/jobs/`
+# You can use any class. The only requirement is that
+# class should have a method `perform` without arguments.
+#
+# class TestJob
+#   def perform
+#     puts 'Test!'
+#   end
+# end
+#
+# Crono.perform(TestJob).every 2.days, at: '15:30'
+#
+
+require 'rake'
+
+Rails.app_class.load_tasks
+
+class CleanupDrafts
+  def perform
+    Rake::Task['drafts:cleanup'].invoke
+  end
+end
+
+class CleanupDistSignals
+  def perform
+    Rake::Task['dist_signals:cleanup'].invoke
+  end
+end
+
+Crono.perform(CleanupDrafts).every 1.day
+Crono.perform(CleanupDistSignals).every 1.day

--- a/config/deploy/docker-production.rb
+++ b/config/deploy/docker-production.rb
@@ -24,7 +24,7 @@ server docker: {
   commit: 'dr.nemui.org/mmw-job',
   volume: "#{Dir.pwd}:/src",
   env: {
-    APP_SERVER_CMD: "bundle exec bin/delayed_job run"
+    APP_SERVER_CMD: "foreman start -f Procfile.job"
   }
 }, user: 'rails:rails', roles: :app
 

--- a/config/deploy/docker-staging.rb
+++ b/config/deploy/docker-staging.rb
@@ -24,7 +24,7 @@ server docker: {
   commit: 'dr.nemui.org/mmw-stage-job',
   volume: "#{Dir.pwd}:/src",
   env: {
-    APP_SERVER_CMD: "bundle exec bin/delayed_job run"
+    APP_SERVER_CMD: "foreman start -f Procfile.job"
   }
 }, user: 'rails:rails', roles: :app
 

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,4 +27,8 @@ Rails.application.routes.draw do
   get 'logout', to: 'welcome#logout'
 
   root 'welcome#index'
+
+  authenticate :user, lambda { |u| u.is_admin? } do
+    mount Crono::Web, at: '/crono'
+  end
 end

--- /dev/null
+++ b/db/migrate/20170830152444_create_crono_jobs.rb
@@ -0,0 +1,16 @@
+class CreateCronoJobs < ActiveRecord::Migration[5.1]
+  def self.up
+    create_table :crono_jobs do |t|
+      t.string    :job_id, null: false
+      t.text      :log, limit: 1073741823 # LONGTEXT for MySQL
+      t.datetime  :last_performed_at
+      t.boolean   :healthy
+      t.timestamps null: false
+    end
+    add_index :crono_jobs, [:job_id], unique: true
+  end
+
+  def self.down
+    drop_table :crono_jobs
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170817080018) do
+ActiveRecord::Schema.define(version: 20170830152444) do
 
   create_table "areas", force: :cascade do |t|
     t.string "ns"
@@ -24,6 +24,16 @@ ActiveRecord::Schema.define(version: 20170817080018) do
     t.index ["ns", "code"], name: "index_areas_on_ns_and_code", unique: true
   end
 
+  create_table "crono_jobs", force: :cascade do |t|
+    t.string "job_id", null: false
+    t.text "log", limit: 1073741823
+    t.datetime "last_performed_at"
+    t.boolean "healthy"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["job_id"], name: "index_crono_jobs_on_job_id", unique: true
+  end
+
   create_table "delayed_jobs", force: :cascade do |t|
     t.integer "priority", default: 0, null: false
     t.integer "attempts", default: 0, null: false

--- /dev/null
+++ b/lib/tasks/cleanup_dist_signals.rake
@@ -0,0 +1,10 @@
+namespace :dist_signals do
+  desc "Cleanup old dist signals"
+  task cleanup: :environment do
+    DistSignal.transaction do
+      count = DistSignal.where(status: %i(completed failed ignored)).
+        where("created_at < ?", 1.week.ago).delete_all
+      Rails.logger.info "Remove old #{count} dist signals"
+    end
+  end
+end