pixelforce_recipes 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40e55ffb256c9c468b6a0f783889e4ea4f42dca
-  data.tar.gz: d752bcd16f3fa0017fc4f0cd732a2ddac037988f
+  metadata.gz: 64f4526b060f50034f0c162a5eba31076fd6ef5e
+  data.tar.gz: 0d3241f33aefabbd1a6ba449f52ab5b269bff811
 SHA512:
-  metadata.gz: 441eaecd80b0c50da3e70211c4efa2a4446f1c117a3d52fd33b6801035702c19f325a9d8cd9c8b14fc42c7b455351bedea9e2674f794406664a020fc0011de20
-  data.tar.gz: 0f1bb92ede4277bec0badf5bbb8cd9554c6419a659fc12e6e0c38fa811a729c75af738cda2f2b74e01923263ee3a0c6ec967e7623d798c1decb4e6236576e22c
+  metadata.gz: 62053ca4fce227f367dfb66eaa834f2a68582af12603b8eabbbb14c3d2645f01e399c694d11f9637a4de980a68991d40599552d0279eaa4907b54366aa44e53e
+  data.tar.gz: 820c96d215832f9073b4df3c3ebe67e917bc1e2c530244c0ac429fbeb35c6292ec9d1e2c6992d48946fe60208cefc51b5420c04118a4047fe3b4cf0b9be33287

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (1.5)
+    pixelforce_recipes (1.6)
       capistrano (> 2.0.0)
 
 GEM
@@ -14,9 +14,9 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.2.5)
-    i18n (1.1.1)
+    i18n (1.4.0)
       concurrent-ruby (~> 1.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)

data/lib/pixelforce_recipes/capistrano_3_recipes/resque_scheduler.rb

@@ -0,0 +1,22 @@
+namespace :resque_scheduler do
+  desc "Install resque scheduler"
+
+  desc "Setup resque scheduler configuration for this application"
+  task :setup do
+    on roles(:resque) do
+      template "resque_scheduler_init.erb", "/tmp/resque_scheduler"
+      sudo "mv /tmp/resque_scheduler /etc/init.d/resque_scheduler"
+      sudo "chmod +x /etc/init.d/resque_scheduler"
+      sudo "update-rc.d resque_scheduler defaults"
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} resque_scheduler"
+    task command do
+      on roles(:resque) do
+        execute "/etc/init.d/resque_scheduler #{command}"
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -14,7 +14,7 @@ namespace :sidekiq do
   %w[start stop restart].each do |command|
     desc "#{command} sidekiq"
     task command do
-      on roles(:resque) do
+      on roles(:sidekiq) do
         execute "/etc/init.d/sidekiq #{command}"
       end
     end

data/lib/pixelforce_recipes/legacy_recipes/resque_scheduler.rb

@@ -0,0 +1,22 @@
+if Capistrano::Configuration.instance(false)
+  Capistrano::Configuration.instance(true).load do |instance|
+    namespace :resque_scheduler do
+      desc "Install resque scheduler"
+
+      desc "Setup resque scheduler configuration for this application"
+      task :setup, roles: :resque do
+        template "resque_scheduler_init.erb", "/tmp/resque_scheduler"
+        run "#{sudo} mv /tmp/resque_scheduler /etc/init.d/resque_scheduler"
+        run "#{sudo} chmod +x /etc/init.d/resque_scheduler"
+        run "#{sudo} update-rc.d resque_scheduler defaults"
+      end
+
+      %w[start stop restart].each do |command|
+        desc "#{command} resque scheduler"
+        task command do
+          run "/etc/init.d/resque_scheduler #{command}"
+        end
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/templates/puma_init.erb

@@ -13,7 +13,7 @@
 USER="<%= fetch(:user) %>"
 DAEMON=puma
 PROJECT_PATH="<%= fetch(:deploy_to) %>"
-DAEMON_OPTS="-e <%= fetch(:rails_env) %>"
+DAEMON_OPTS="-e <%= fetch(:rails_env) %> -d"
 NAME=puma
 DESC="puma app for $USER"
 PID="$PROJECT_PATH/shared/pids/puma.pid"
@@ -52,4 +52,4 @@ case "$1" in
         ;;
 esac
 
-exit 0
+exit 0

data/lib/pixelforce_recipes/templates/resque_scheduler_init.erb

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:          resque scheduler
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: resque scheduler worker via init.d
+# Description:       starts resque scheduler
+### END INIT INFO
+
+USER="deploy"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
+NAME="resque_scheduler"
+DESC="Resque Scheduler for $USER"
+PID="$PROJECT_PATH/shared/pids/resque_scheduler.pid"
+LOGFILE="$PROJECT_PATH/shared/log/resque.log"
+CD_TO_APP_DIR="cd $PROJECT_PATH/current"
+
+
+case "$1" in
+  start)
+        START_DAEMON_PROCESS="bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE='*' PIDFILE=$PID BACKGROUND=yes environment resque:scheduler 2>&1 > $LOGFILE"
+        echo -n "Starting $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  stop)
+        STOP_DAEMON_PROCESS="test -f $PID && kill -s QUIT `cat $PID` && rm -f $PID"
+        echo -n "Stopping $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  *)
+        echo "Usage: $NAME {start|stop|restart|reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = "1.5"
+  VERSION = "1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,12 +87,14 @@ files:
 - lib/pixelforce_recipes/capistrano_3_recipes/logrotate.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/puma.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/resque.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/resque_scheduler.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb
 - lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb
 - lib/pixelforce_recipes/legacy_recipes/base.rb
 - lib/pixelforce_recipes/legacy_recipes/logrotate.rb
 - lib/pixelforce_recipes/legacy_recipes/puma.rb
 - lib/pixelforce_recipes/legacy_recipes/resque.rb
+- lib/pixelforce_recipes/legacy_recipes/resque_scheduler.rb
 - lib/pixelforce_recipes/legacy_recipes/sidekiq.rb
 - lib/pixelforce_recipes/legacy_recipes/unicorn.rb
 - lib/pixelforce_recipes/templates/logrotate.erb
@@ -100,6 +102,7 @@ files:
 - lib/pixelforce_recipes/templates/nginx_puma_config.erb
 - lib/pixelforce_recipes/templates/puma_init.erb
 - lib/pixelforce_recipes/templates/resque_init.erb
+- lib/pixelforce_recipes/templates/resque_scheduler_init.erb
 - lib/pixelforce_recipes/templates/sidekiq_init.erb
 - lib/pixelforce_recipes/templates/unicorn_init.erb
 - lib/pixelforce_recipes/version.rb