thinking-sphinx-monit 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 884effdadddb405bce9d24ece788efc47531302a
-  data.tar.gz: d41ed4279a601cc0b8af51fcf13b5d661ea7b8e1
+  metadata.gz: 300dc2fd9d4e326914bcb2b2afc79ee0965bd4b3
+  data.tar.gz: 66197d1062459534c8a169b4f76c743c462a22ca
 SHA512:
-  metadata.gz: ed6641f639ed18da81a9ec034bad3b3812794d2111c80abfe0ca2a8f396955a2a2599c37d62a9fa0ff775cef49eb64d67a8339f3cd13c1e5c91df96ce0e62616
-  data.tar.gz: 6fbdaf8417067c0348b6f2fe789671aab2dce9fa6b344345fa5d90db372818f14d09e52534930dea792fc311576a989ffc2346d977e618af1f5c14ba5bf24e42
+  metadata.gz: 50888d55d11726142c0f950f156b916c3786ce944c29a655dae04952d47f359e3810227e4cdf9029fea2062e591cc8822451ae1244ef911d95b380177f2da10c
+  data.tar.gz: c4dc3b147b66dae5af424d6594cfa1f6ad46d7a527f2f32620879d94b6ab2de16a021b105392ed3f25b5edd78aa2e1c856112d84f60d32a2ddde30d71984bae1

data/README.md

@@ -18,7 +18,12 @@ Add to your capfile following line:
 # Capfile
 require 'thinking_sphinx_monit/capistrano'
 ```
-It's also needed to specify thinking sphinx hooks in your deploy.rb, for example like this:
+Before any other action please first deploy your app to server (needed for all stages which you want to use):
+```ruby
+cap <stage> deploy
+```
+
+Then you can specify thinking sphinx hooks in your deploy.rb, for example like this:
 ```ruby
 before 'deploy:updating', 'thinking_sphinx:stop'
 after 'deploy:published', 'thinking_sphinx:start'
@@ -31,7 +36,7 @@ before 'thinking_sphinx:stop', 'thinking_sphinx_monit:unmonitor'
 after 'thinking_sphinx:start', 'thinking_sphinx_monit:monitor'
 ```
 
-Of course you can do everything manually, but remember to do ```cap <stage> deploy``` before any following tasks (just once per stage):
+Of course you can do everything manually:
 ```ruby
 cap thinking_sphinx_monit:config     # Generates Thinking Sphinx monit-service
 cap thinking_sphinx_monit:monitor    # Monitor Thinking Sphinx monit-service

data/lib/thinking_sphinx_monit/tasks/capistrano.rb

@@ -12,7 +12,7 @@ namespace :thinking_sphinx_monit do
     on roles(fetch(:thinking_sphinx_roles)) do |role|
       within current_path do
         with rails_env: fetch(:thinking_sphinx_rails_env) do
-          execute :rake, "ts_monit:config[#{role.user},#{fetch(:thinking_sphinx_use_sudo)},#{fetch(:tmp_dir)},#{fetch(:thinking_sphinx_monit_conf_dir)},#{fetch(:thinking_sphinx_monit_bin)},#{ts_monit_service_name},#{fetch(:rails_env)}]"
+          execute :rake, "ts_monit:config[#{role.user},#{fetch(:thinking_sphinx_use_sudo)},#{fetch(:tmp_dir)},#{fetch(:thinking_sphinx_monit_conf_dir)},#{fetch(:thinking_sphinx_monit_bin)},#{ts_monit_service_name}]"
         end
       end
     end

data/lib/thinking_sphinx_monit/tasks/monit.rb

@@ -3,13 +3,12 @@ require 'thinking-sphinx'
 namespace :ts_monit do
 
   desc 'Generates Thinking Sphinx monit-service'
-  task :config, [:user, :sudo, :tmp_dir, :monit_conf_dir, :monit_bin, :service_name, :env] => [:environment] do |_, args|
+  task :config, [:user, :sudo, :tmp_dir, :monit_conf_dir, :monit_bin, :service_name] => [:environment] do |_, args|
     @searchd = searchd
     @config_path = config.configuration_file
     @ts_pid_file = config.searchd.pid_file
     @user = args.user
     @service_name = args.service_name
-    @rails_env = args.env
     template_sphinx 'ts_monit.conf', "#{args.tmp_dir}/ts_monit.conf"
     sudo_if_needed args.sudo, "mv #{args.tmp_dir}/ts_monit.conf #{args.monit_conf_dir}"
     sudo_if_needed args.sudo, "#{args.monit_bin} reload"

data/lib/thinking_sphinx_monit/templates/ts_monit.conf.erb

@@ -3,5 +3,5 @@
 #
 check process <%= @service_name %>
 with pidfile "<%= @ts_pid_file %>"
-start program = "/usr/bin/sudo -iu <%= @user %> /bin/bash -c '<%= @searchd %> --pidfile --config <%= @config_path %> --environment <%= @rails_env%>'"
-stop program = "/usr/bin/sudo -iu <%= @user %> /bin/bash -c '<%= @searchd %> --pidfile --config <%= @config_path %> --stopwait --environment <%= @rails_env%>'"
+start program = "/usr/bin/sudo -iu <%= @user %> /bin/bash -c '<%= @searchd %> --pidfile --config <%= @config_path %>'"
+stop program = "/usr/bin/sudo -iu <%= @user %> /bin/bash -c '<%= @searchd %> --pidfile --config <%= @config_path %> --stopwait'"

data/lib/thinking_sphinx_monit/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinxMonit
-  VERSION = '1.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx-monit
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Michal Mrozek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano