negroku 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01bf413acd0b948297dbcced9766fefdad757d62
-  data.tar.gz: a73e617613036fea3c2b172afa402de40b3a2e89
+  metadata.gz: 90b0dd4913acc2b6bd2a667860a768f333b15e7b
+  data.tar.gz: dedf7fc1f40a0ae5d4dcf04efbe5041428de355a
 SHA512:
-  metadata.gz: f79094555d1d5359db52705d53e4ae264f9243e5c3d3cb16241cd6614e20020dc96d55772efb3f66b73bf2949ba1b8af6147dc55bbf2cb0f2e5ef102a0de0071
-  data.tar.gz: 6a501c68f82e71ee792fab31d844c4206b649650051d8613229c935fcc6c781b2dd180d05cf6e11700bc58bde8fd6fbb06c301098b8e8b319bd4dae12624eb28
+  metadata.gz: 1e88de7c39d95d51ab839f3b21939f2c73289c5bab317bac921ed5faca8c2092f956fb3793914202dee0ba8e582302afd3b2352939473354d74af6a40e8177b0
+  data.tar.gz: 3806015f329ad0489cd38af8e55664b7fbd0953c8bd781244750a4532b49871a1d9e32f5d53c78c26d4be0cd4492c82051beeae7bfd307fc093007728dbe5ba7

data/lib/negroku/tasks/thinking_sphinx.rake

@@ -52,7 +52,11 @@ namespace :negroku do
     task :backup_config do
       on release_roles fetch(:thinking_sphinx_roles) do
         within "#{shared_path}/config" do
-          execute :cp, fetch(:thinking_sphinx_configuration_file), '/tmp/sphinx.conf.bak'
+          if test("[ -f #{fetch(:thinking_sphinx_configuration_file)} ]")
+            execute :cp, fetch(:thinking_sphinx_configuration_file), '/tmp/sphinx.conf.bak'
+          else
+            set :thinking_sphinx_config_changed, true
+          end
         end
       end
     end
@@ -61,8 +65,10 @@ namespace :negroku do
     task :check_config do
       on release_roles fetch(:thinking_sphinx_roles) do
         within "#{shared_path}/config" do
-          config_diff = capture "diff -q /tmp/sphinx.conf.bak #{fetch(:thinking_sphinx_configuration_file)}", raise_on_non_zero_exit: false
-          set :thinking_sphinx_config_changed, !config_diff.empty?
+          if fetch(:thinking_sphinx_config_changed, nil).nil?
+            config_diff = capture "diff -q /tmp/sphinx.conf.bak #{fetch(:thinking_sphinx_configuration_file)}", raise_on_non_zero_exit: false
+            set :thinking_sphinx_config_changed, !config_diff.empty?
+          end
         end
       end
     end

data/lib/negroku/templates/tasks/eye/_delayed_job.erb

@@ -1,9 +1,9 @@
   group 'delayed-jobs' do
     chain grace: 10.seconds
 
-    start_timeout 20.seconds
-    stop_timeout 20.seconds
-    restart_timeout 20.seconds
+    start_timeout <%= options[:start_timeout] || "30.seconds" %>
+    stop_timeout <%= options[:stop_timeout] || "40.seconds"  %>
+    restart_timeout <%= options[:restart_timeout] || "30.seconds"  %>
 
     workers_count = '<%= fetch(:delayed_job_workers || 1) %>'.to_i
 

data/lib/negroku/templates/tasks/eye/_process.erb

@@ -1,7 +1,7 @@
   process "<%= options[:name] %>" do
-    start_timeout <%= options[:start_timeout] %>
-    stop_timeout <%= options[:stop_timeout] %>
-    restart_timeout <%= options[:restart_timeout] %>
+    start_timeout <%= options[:start_timeout] || "30.seconds" %>
+    stop_timeout <%= options[:stop_timeout] || "20.seconds"  %>
+    restart_timeout <%= options[:restart_timeout] || "30.seconds"  %>
 
     pid_file "<%= options[:pid_file] %>"
     start_command "<%= options[:start_command] %>"

data/lib/negroku/version.rb

@@ -1,3 +1,3 @@
 module Negroku
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: negroku
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc