mina-stack 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8381015a574a1bbb6358e48ab5297e745c1850e2
-  data.tar.gz: ced92348ee91758f7df314ac3c72b02cb81feff3
+  metadata.gz: 41657532ecb9ded634c1794d5b09f6628b12ee24
+  data.tar.gz: 7361e4eb69c3af516317ff339effada79cad24e1
 SHA512:
-  metadata.gz: 78aa9fe324e8c6c514f5ebd7635ccbbfce70a6c551bed281f412c2265ec4f09fb4e3b097418a5e6a29669b25233d447af7b926b8596d3fe137a6a00a3f45aa06
-  data.tar.gz: 130a7015ee9e94f1bc96448e54b1dc21c53daddbbf16cd9a448200ac8fa2745273ce9d7a39db3de62778a3531566ac5d2f0133cce51de8cac8d03b6ef358c4aa
+  metadata.gz: 353e146be32ce47eff2ab91606620991468e65bbc896c3aa7aa3dc589229bee599e9d29f0ad5024b1c2422c0a027cb1c68080aba5daaa116e213b350fcc68f20
+  data.tar.gz: c530196e4938b8d39c6063ef6320bf096830447fe406e4a59ea12813f8029d196f769bc28384d51d7ddf10733569c32248a22c2588c9cf6cdaa66d6d66bccae1

data/lib/mina-stack/defaults.rb

@@ -1,5 +1,5 @@
 task :defaults do
-  set_default :ruby_version,          "2.2.2"
+  set_default :ruby_version,          "2.2.3"
   set_default :services_path,         "/etc/init.d"
   set_default :upstart_path,          "/etc/init"
   set_default :tmp_path,              "#{deploy_to}/#{shared_path}/tmp"
@@ -56,10 +56,8 @@ task :defaults do
   set_default :sidekiq_log,           "#{logs_path}/sidekiq.log"
   set_default :sidekiq_pid,           "#{pids_path}/sidekiq.pid"
   set_default :sidekiq_concurrency,   10
-  # set_default :sidekiq_start,         "(cd #{deploy_to}/#{current_path}; nohup #{sidekiq_cmd} -e #{rails_env} -C #{sidekiq_config} -P #{sidekiq_pid} >> #{sidekiq_log} 2>&1 </dev/null &)"
-  set_default :sidekiq_start,         "#{sidekiq_cmd} -e #{rails_env} -C #{sidekiq_config} -P #{sidekiq_pid} >> #{sidekiq_log}"
+  set_default :sidekiq_start,         "#{sidekiq_cmd} -e #{rails_env} -C #{sidekiq_config}"
   set_default :sidekiq_upstart,       "#{upstart_path!}/#{sidekiq_name}.conf"
-  # set_default :sidekiq_stop,          "(cd #{deploy_to}/#{current_path} && #{sidekiqctl_cmd} stop #{sidekiq_pid} #{sidekiq_timeout})"
 
   set_default :private_pub_name,      "private_pub_#{app_namespace}"
   set_default :private_pub_cmd,       lambda { "#{bundle_prefix} rackup private_pub.ru" }

data/lib/mina-stack/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Stack
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/recipes/sidekiq.rb

@@ -14,29 +14,19 @@ namespace :sidekiq do
     queue "sudo mv /tmp/sidekiq_conf #{sidekiq_upstart}"
   end
 
-  # %w[quiet].each do |command|
-  #   desc "#{command.capitalize} sidekiq"
-  #   task command do
-  #     queue %{ if [ -f #{sidekiq_pid} ]; then
-  #       echo "-----> #{command.capitalize} sidekiq"
-  #       #{echo_cmd %{(cd #{deploy_to}/#{current_path} && #{sidekiqctl_cmd} #{command} #{sidekiq_pid})} }
-  #       fi }
-  #   end
-  # end
 
-  # desc "Restart Sidekiq"
-  # task :restart do
-  #   invoke :'sidekiq:stop'
-  #   invoke :'sidekiq:start'
-  # end
+  desc "Quiet sidekiq (stop accepting new work)"
+  task :quiet => :environment do
+    queue "service #{sidekiq_name} reload"
+    queue  %[echo "-----> Quiet sidekiq (stop accepting new work)."]
+  end
+
 
-  # %w[start stop].each do |command|
-  #   desc "#{command.capitalize} sidekiq"
-  #   task command do
-  #     # need to get rid of sudo here: have to figure out how it works with upstart
-  #     invoke :sudo
-  #     queue "sudo service #{sidekiq_name} #{command}"
-  #     queue  %[echo "-----> #{command.capitalize} sidekiq."]
-  #   end
-  # end
-end
+  %w[start stop restart].each do |command|
+    desc "#{command.capitalize} sidekiq"
+    task command => :environment do
+      queue "service #{sidekiq_name} #{command}"
+      queue  %[echo "-----> #{command.capitalize} sidekiq."]
+    end
+  end
+end

data/lib/templates/upstart/sidekiq.conf.erb

@@ -3,11 +3,26 @@
 # This example config should work with Ubuntu 12.04+.  It
 # allows you to manage multiple Sidekiq instances with
 # Upstart, Ubuntu's native service management tool.
+#
+# See workers.conf for how to manage all Sidekiq instances at once.
+#
+# Save this config as /etc/init/sidekiq.conf then manage sidekiq with:
+#   sudo start sidekiq index=0
+#   sudo stop sidekiq index=0
+#   sudo status sidekiq index=0
+#
+# Hack Upstart's reload command to 'quiet' Sidekiq:
+#
+#   sudo reload sidekiq index=0
+#
+# or use the service command:
+#   sudo service sidekiq {start,stop,restart,status}
+#
 
 description "Sidekiq Background Worker"
 
-# no "start on", we don't want to automatically start
-#stop on (stopping workers or runlevel [06])
+start on runlevel [2345]
+stop on runlevel [016]
 
 setuid <%= user %>
 setgid <%= user %>
@@ -15,6 +30,14 @@ setgid <%= user %>
 respawn
 respawn limit 3 30
 
+# TERM is sent by sidekiqctl when stopping sidekiq. Without declaring these as
+# normal exit codes, it just respawns.
+normal exit 0 TERM
+
+# Older versions of Upstart might not support the reload command and need
+# this commented out.
+reload signal USR1
+
 script
 # this script runs in /bin/sh by default
 # respawn as bash so we can source in rbenv
@@ -38,7 +61,10 @@ exec /bin/bash <<'EOT'
     # if you aren't using auto, set your version here
     # chruby 2.0.0
   fi
+
+  # Logs out to /var/log/upstart/sidekiq.log by default
+
   cd <%= "#{deploy_to!}/#{current_path!}" %>
   <%= sidekiq_start %>
 EOT
-end script
+end script

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Igor Davydov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Mina + stack