oysters 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20cba2532bf771c8aa807c77a34aca1ce413a18
-  data.tar.gz: 3bccd352c578c19da4f8306f93244d2663a4c03e
+  metadata.gz: ea9eeda4ba076675b827f384b4a6d556627627ad
+  data.tar.gz: 8d5669b9d4f64d27d65cd25484d37478f29ba0ae
 SHA512:
-  metadata.gz: 1541a3ca984d2317d046b40336ab96d8de757561117b652f3ca49e9dd7b3353103b66eecdeeb2e48e18cbb41039d2975623c297bae71d604bcd3c5507fc1d746
-  data.tar.gz: ba53eb87f0ede11d87be8c62dae56c9fca4f3610dd9e872311a19cc54219c0c62a1db49259bbe67b4e18599156668d917261e15f6ed7b42f03564dc180bd7a66
+  metadata.gz: 15da67a2b00ce7b9455166804cc6f1d2a3b748710ddf40f41da75aff0b1836c069066fa54a33842aeb5f7a425f74de4324cb8ef7f313ee244a9c8a526603cf7b
+  data.tar.gz: 6031b5ca3972e37aed3e297af21b3e2e5c0a1c71a96fe61c8744ab26491f03a84b4953c3eb0b532fe9e15f65b17a2ef6192181689b1cf0f85fe5523e57db43c5

data/lib/oysters/initd/logrotate.rb

@@ -7,29 +7,16 @@ Oysters.with_configuration do
     namespace :logrotate do
       desc 'Install logrotate config'
       task :install, roles: :app do
-        log_path = [ Pathname.new(shared_path).join('log', "#{rails_env}.log").to_s ]
-
-        if application == 'oiv-ui'
-          %W(#{rails_env}_delayed_job.log #{rails_env}_security_audit.log unicorn_#{rails_env}.stderr.log skylight.log).each do |log|
-            log_path << Pathname.new(shared_path).join('log', log).to_s
-          end
-        end
-
-        if application == 'oiv-api'
-          %W(skylight.log).each do |log|
-            log_path << Pathname.new(shared_path).join('log', log).to_s
-          end
-        end
+        log_path = Pathname.new(shared_path).join('log', "*.log").to_s
 
         conf_path = "/etc/logrotate.d/#{application}_logs"
-        log_path  = log_path.join(' ')
         tmp_file  = "/tmp/#{application}_logs_#{rand}"
         location  = File.expand_path('../../templates/logrotate_config.erb', __FILE__)
         config    = ERB.new(File.read(location))
 
         put config.result(binding), tmp_file
-        sudo "mv #{tmp_file} #{conf_path}"
-        sudo "logrotate #{conf_path}"
+        sudo "mv #{tmp_file} #{conf_path}", pty: true, shell: :bash
+        sudo "logrotate #{conf_path}", pty: true, shell: :bash
       end
     end
 

data/lib/oysters/unified/initd.rb

@@ -15,22 +15,22 @@ Oysters.with_configuration do
           task :install, roles: :app do
             tmp_config_path = "/tmp/#{program}_initd_script.sh"
             # Remove old tmp config if present
-            run "sudo rm -f #{tmp_config_path}", pty: true, shell: :bash
+            sudo "rm -f #{tmp_config_path}", pty: true, shell: :bash
 
             config = File.read(File.expand_path("../scripts/#{program}_initd_script.sh", __FILE__))
             put config, tmp_config_path, shell: :bash
 
-            run "sudo cp #{tmp_config_path} /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
-            run "sudo chmod +x /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
-            run "sudo chkconfig --add #{application}_#{program}", pty: true, shell: :bash
+            sudo "cp #{tmp_config_path} /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
+            sudo "chmod +x /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
+            sudo "chkconfig --add #{application}_#{program}", pty: true, shell: :bash
             run "rm -f #{tmp_config_path}", shell: :bash
           end
 
           #Run this task as a sudo user!
           desc "Remove #{program} init.d script"
           task :uninstall, roles: :app do
-            run "sudo chkconfig --del #{application}_#{program}", pty: true, shell: :bash
-            run "sudo rm -f /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
+            sudo "chkconfig --del #{application}_#{program}", pty: true, shell: :bash
+            sudo "rm -f /etc/init.d/#{application}_#{program}", pty: true, shell: :bash
           end
         end
       end
@@ -45,20 +45,20 @@ Oysters.with_configuration do
         task :install, roles: :app do
           tmp_config_path = "/tmp/deployed_application_sysconfig.sh"
           # Remove old tmp config if present
-          run "sudo rm -f #{tmp_config_path}", pty: true, shell: :bash
+          sudo "rm -f #{tmp_config_path}", pty: true, shell: :bash
 
           location = File.expand_path('../templates/app_sysconfig.sh.erb', __FILE__)
           config = ERB.new(File.read(location))
           put config.result(binding), tmp_config_path, shell: :bash
 
-          run "sudo cp #{tmp_config_path} /etc/sysconfig/deployed_application", pty: true, shell: :bash
+          sudo "cp #{tmp_config_path} /etc/sysconfig/deployed_application", pty: true, shell: :bash
           run "rm -f #{tmp_config_path}", shell: :bash
         end
 
         #Run this task as a sudo user!
         desc 'Remove sysconfig'
         task :uninstall, roles: :app do
-          run "sudo rm -f /etc/sysconfig/deployed_application", pty: true, shell: :bash
+          sudo "rm -f /etc/sysconfig/deployed_application", pty: true, shell: :bash
         end
       end
 

data/lib/oysters/unified/scripts/kewatcher_initd_script.sh

@@ -13,55 +13,62 @@ start() {
   local program
   local options
 
-  echo "Starting KEWatcher"
   if [ -e $KEWATCHER_PIDFILE ] && kill -0 `cat $KEWATCHER_PIDFILE` > /dev/null 2>&1; then
     echo "KEWatcher is already Running"
-    echo_success
     return 0
   fi
 
+  cd $ROOT_PATH
+
+  env_vars="RAILS_ENV=$RAILS_ENV"
   options="-m $KEWATCHER_MAX_WORKERS -c $KEWATCHER_REDIS_CONFIG -p $KEWATCHER_PIDFILE $KEWATCHER_VERBOSE"
+  program="source /home/$APP_USER/.bash_profile; $env_vars bundle exec $ROOT_PATH/bin/kewatcher $options 2>&1 >> $KEWATCHER_LOGFILE &"
 
-  su $APP_USER -c "cd $ROOT_PATH; source /home/$APP_USER/.bash_profile; RAILS_ENV=$RAILS_ENV nohup bundle exec $ROOT_PATH/bin/kewatcher $options 2>&1 >> $KEWATCHER_LOGFILE &"
-  RETVAL=$?
+  action 'Starting KEWatcher...' daemon --user "${APP_USER#$USER}" --pidfile=$KEWATCHER_PIDFILE $program
 
+  # workaround to allow KEWatcher to setup a trap for HUP signal
   sleep 5
-
-  if [ $RETVAL -eq 0 ]; then
-    echo_success
-  else
-    echo_failure
-  fi
-  echo
 }
 
 stop() {
-  echo "Stopping KEWatcher"
-
   if [ -f $KEWATCHER_PIDFILE ]; then
-    kill -s QUIT $(cat $KEWATCHER_PIDFILE)
-    RETVAL=$?
-    sleep 10
+    # The idea is to let KEWatcher to gracefully stop,
+    # wait with delay gives us dynamic wait interval
+    # limited by N tries.
+
+    action 'Stopping KEWatcher...' _stop_with_wait $(cat $KEWATCHER_PIDFILE)
   else
-    RETVAL=1
+    echo "Resque KEWatcher is not running"
   fi
 
-  echo "Killing stuck workers"
+  echo 'Killing stuck workers...'
   kill -s KILL `pgrep -xf "[r]esque-[0-9]+.*" | xargs` > /dev/null 2>&1
 
-  if [ $RETVAL -eq 0 ]; then
-    rm -f $KEWATCHER_PIDFILE
-  else
-    echo "Resque KEWatcher is not running"
-  fi
-  echo_success
+  rm -f $KEWATCHER_PIDFILE
+}
+
+_stop_with_wait() {
+  local pid delay tries try
+
+  delay=10
+  tries=3
+  pid=$1
+  try=0
+
+  kill -s QUIT $pid
+
+  while [ $try -lt $tries ] ; do
+    checkpid $pid || return 0
+    sleep $delay
+    let try+=1
+  done
 }
 
 case "$1" in
   start) start ;;
   stop) stop ;;
   restart)
-    echo "Restarting Resque KEWatcher ... "
+    echo "Restarting Resque KEWatcher..."
     stop
     start
     ;;

data/lib/oysters/unified/scripts/resque_scheduler_initd_script.sh

@@ -15,42 +15,38 @@ start() {
 
   cd $ROOT_PATH
 
-  echo "Starting Resque Scheduler"
   options="RAILS_ENV=$RAILS_ENV VERBOSE=$SCHEDULER_VERBOSE BACKGROUND=$BACKGROUND DYNAMIC_SCHEDULE=$DYNAMIC_SCHEDULE PIDFILE=$SCHEDULER_PIDFILE"
   program="source /home/$APP_USER/.bash_profile; bundle exec rake resque:scheduler $options 2>&1 >> $SCHEDULER_LOGFILE"
 
-  if [[ $APP_USER == $USER ]]
-  then
-    daemon --pidfile=$SCHEDULER_PIDFILE $program
-  else
-    daemon --user $APP_USER --pidfile=$SCHEDULER_PIDFILE $program
-  fi
-  RETVAL=$?
+  action 'Starting Resque Scheduler...' daemon --user "${APP_USER#$USER}" --pidfile=$SCHEDULER_PIDFILE $program
 
-  if [ $RETVAL -eq 0 ]; then
-    echo_success
-  else
-    echo_failure
-  fi
-  echo
+  # workaround to allow Resque Scheduler to setup a trap for HUP signal
+  sleep 5
 }
 
 stop() {
-  echo "Stopping Resque Scheduler"
-
   if [ -f $SCHEDULER_PIDFILE ]; then
-    kill -s QUIT $(cat $SCHEDULER_PIDFILE)
-    RETVAL=$?
+    action 'Stopping Resque Scheduler...' _stop_with_wait $(cat $SCHEDULER_PIDFILE)
   else
-    RETVAL=1
+    echo 'Resque Scheduler is not running'
   fi
+}
 
-  if [ $RETVAL -eq 0 ]; then
-    rm -f $SCHEDULER_PIDFILE
-  else
-    echo "Resque Scheduler is not running"
-  fi
-  echo_success
+_stop_with_wait() {
+  local pid delay tries try
+
+  delay=2
+  tries=3
+  pid=$1
+  try=0
+
+  kill -s QUIT $pid
+
+  while [ $try -lt $tries ] ; do
+    checkpid $pid || return 0
+    sleep $delay
+    let try+=1
+  done
 }
 
 case "$1" in
@@ -59,7 +55,6 @@ case "$1" in
   restart)
     echo "Restarting Resque scheduler ... "
     stop
-    sleep 2
     start
     ;;
   *)

data/lib/oysters/unified/scripts/unicorn_initd_script.sh

@@ -16,54 +16,55 @@ start() {
 
   cd $ROOT_PATH
 
-  echo "Starting Unicorn"
   env_vars="RAILS_ENV=$RAILS_ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE"
   options="-c $UNICORN_CONFIG -E $RAILS_ENV -D "
   program="source /home/$APP_USER/.bash_profile; $env_vars bundle exec unicorn $options"
 
-  if [[ $APP_USER == $USER ]]
-  then
-    daemon --pidfile=$UNICORN_PIDFILE $program
-  else
-    daemon --user $APP_USER --pidfile=$UNICORN_PIDFILE $program
-  fi
-  RETVAL=$?
+  action 'Starting Unicorn...' daemon --user "${APP_USER#$USER}" --pidfile=$UNICORN_PIDFILE $program
+}
+
+stop() {
+  local unicorn_pid
 
-  if [ $RETVAL -eq 0 ]; then
-    echo_success
+  unicorn_pid=$(cat $UNICORN_PIDFILE)
+
+  if checkpid $unicorn_pid ; then
+    action 'Stopping Unicorn...' kill -s QUIT $unicorn_pid
   else
-    echo_failure
+    echo "Unicorn is not running"
   fi
-  echo
 }
 
-stop() {
-  echo "Stopping Unicorn"
+restart() {
+  local unicorn_pid restart_sleep
+
+  restart_sleep=5
+
+  echo "Restarting Unicorn..."
 
   if [ -f $UNICORN_PIDFILE ]; then
-    kill -s QUIT $(cat $UNICORN_PIDFILE)
-    RETVAL=$?
-  else
-    RETVAL=1
-  fi
+    unicorn_pid=$(cat $UNICORN_PIDFILE)
+
+    action 'Clonning Master...' kill -s USR2 $unicorn_pid
 
-  if [ $RETVAL -eq 0 ]; then
-    rm -f $UNICORN_PIDFILE
+    [ "${?}" -ne 0 ] && return $?
+
+    sleep $restart_sleep
+
+    if checkpid $unicorn_pid ; then
+      action 'Killing old Master...' kill -s QUIT $unicorn_pid
+    fi
   else
     echo "Unicorn is not running"
+    start
+    return $?
   fi
-  echo_success
 }
 
 case "$1" in
   start) start ;;
   stop) stop ;;
-  restart)
-    echo "Restarting Unicorn ... "
-    stop
-    sleep 5
-    start
-    ;;
+  restart) restart ;;
   *)
     echo "Usage: $0 {start|stop|restart}"
     exit 1

data/lib/oysters/version.rb

@@ -1,3 +1,3 @@
 module Oysters
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oysters
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Roman Samoilov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Common capistrano recipes