capistrano-nginx-unit 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46570db097e14918f9d04863542c5832a9fbdb72cbd8fb974296a534608f9c69
-  data.tar.gz: dd0b9a3ab22b37c83598322d0842af3e46e0189f9dc508fc45065a5e73cc9191
+  metadata.gz: 546d8dfde3f9be1b32a84ccb0be6929d9493a1e89a7ce6587552176f71410975
+  data.tar.gz: 83f15ae81573d3b60cd0cce3743f02b230491399106baf654fa35d1948812b2c
 SHA512:
-  metadata.gz: 84a684b6ee4c2576d52bafb6fd19501ea8434b9057a7390c3710744329ddd0e7643969261f083cbc819192ce707a50f9219da84b2311b87e6e1521e0f9800ca9
-  data.tar.gz: 168c9932f4b17f74d5bf8ece2859595596026ce960afdb4e8c01d141aca9dd445e2cb4700b4c1dc0672b2e64f76111674debbd9090e6d8dd64df512ac386cf27
+  metadata.gz: 1368025a4451ae352f1870459a991f4136ee9f2b1a6514552bea9e8f943cc69dc90391c756124bf57ede91a5f3371c5d2a213c60017d8bd706f647db18586b38
+  data.tar.gz: 939182f24578fb26d1bdd28bc0c3a4a6418a27a24e3d38bf697f447ba9bf29f34a80177317cde016262c1190fd8ed136ceb52537065da3b988dc2f7b28ea5119

data/.gitignore

@@ -5,3 +5,4 @@
 /doc/
 /pkg/
 /tmp/
+/vendor/

data/README.md

@@ -25,9 +25,19 @@ cap nginx_unit:detach              # Detach listener and application configurati
 cap nginx_unit:detach_app          # Detach application configuration from NGINX Unit
 cap nginx_unit:detach_listener     # Detach listener configuration from NGINX Unit
 cap nginx_unit:start               # Start NGINX Unit process
+cap nginx_unit:stop                # Stop NGINX Unit process
 ```
 
-Defined following customizable options.
+`nginx_unit:attach` is main task.  
+The task [sends HTTP request to configure NGINX Unit](http://unit.nginx.org/configuration/) on server.  
+If you want to apply new code when deployed, please invoke `nginx_unit:attach` task after `deploy:published`.
+
+```rb
+# deploy.rb
+after "deploy:published", "nginx_unit:attach"
+```
+
+## Options
 
 ```rb
 set :nginx_unit_roles,        -> { :app }
@@ -41,10 +51,3 @@ set :nginx_unit_user,         -> { nil }
 set :nginx_unit_group,        -> { nil }
 set :nginx_unit_script,       -> { "config.ru" }
 ```
-
-If you want to apply new code when deployed, please invoke `nginx_unit:attach` task after `deploy:published`.
-
-```rb
-# deploy.rb
-after "deploy:published", "nginx_unit:attach"
-```

data/lib/capistrano/nginx-unit/version.rb

@@ -1,3 +1,3 @@
 module Capistrano
-  NGINX_UNIT_VERSION = "0.3"
+  NGINX_UNIT_VERSION = "0.4"
 end

data/lib/capistrano/tasks/nginx-unit.rake

@@ -13,7 +13,6 @@ namespace :load do
   end
 end
 
-# TODO: Stop NGINX Unit process
 namespace :nginx_unit do
   desc "Start NGINX Unit process"
   task :start do
@@ -30,6 +29,19 @@ namespace :nginx_unit do
     end
   end
 
+  # NOTE: Should we detach listener and application before killing?
+  desc "Stop NGINX Unit process"
+  task :stop do
+    on release_roles(fetch(:nginx_unit_roles)) do
+      pid_file = fetch(:nginx_unit_pid)
+      if test("[ -e #{pid_file} ] && kill -0 `cat #{pid_file}`")
+        execute :sudo, :kill, "-s QUIT `cat #{pid_file}`"
+      else
+        info "NGINX Unit is already stopped"
+      end
+    end
+  end
+
   # If you want to apply new code when deployed,
   # please invoke this task after deploy:published
   desc "Attach listener and application configuration to NGINX Unit"
@@ -74,14 +86,26 @@ namespace :nginx_unit do
   desc "Detach listener configuration from NGINX Unit"
   task :detach_listener do
     on release_roles(fetch(:nginx_unit_roles)) do
-      control_nginx_unit(:delete, path: "/listeners/#{fetch(:nginx_unit_listen)}")
+      listen = fetch(:nginx_unit_listen)
+
+      if nginx_unit_conf["listeners"][listen]
+        control_nginx_unit(:delete, path: "/listeners/#{listen}")
+      else
+        info "Listener \"#{listen}\" is already detached"
+      end
     end
   end
 
   desc "Detach application configuration from NGINX Unit"
   task :detach_app do
     on release_roles(fetch(:nginx_unit_roles)) do
-      control_nginx_unit(:delete, path: "/applications/#{fetch(:nginx_unit_app_name)}")
+      app_name = fetch(:nginx_unit_app_name)
+
+      if nginx_unit_conf["applications"][app_name]
+        control_nginx_unit(:delete, path: "/applications/#{app_name}")
+      else
+        info "Application \"#{app_name}\" is already detached"
+      end
     end
   end
 
@@ -98,4 +122,13 @@ namespace :nginx_unit do
 
     execute :curl, *args
   end
+
+  # Get current configuration
+  def nginx_unit_conf
+    JSON.parse(capture(
+      :curl,
+      "--unix-socket #{fetch(:nginx_unit_control_sock)}",
+      "http://localhost/"
+    ))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unit
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - murakmii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano