procsd 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09e6c1faceca84dc0337311001b11397aa338b25bc285960175e4537d3a38f71'
-  data.tar.gz: e1fc39db9a119b15d2042558b093ec222aed03baa67d75f824c3da8b99464e72
+  metadata.gz: 595c0d49250c7eb5075f7c01b7e6f28814bdc319cca686ad0ee0b5a5cea09c28
+  data.tar.gz: de7f7d1df76a9ec2cfdb7c55a90ca87c89fcb387afb28addd52734f42bcf2193
 SHA512:
-  metadata.gz: d321a3cb39f9a5c442a6c088682b020fafa6fc59e6f03b892bd438df4a10b0fcc3490e5651e20eb060e920de22b7364425da07368f73305b089d63a791f4246c
-  data.tar.gz: ce218eae99a2bd36cbc771e3ba199e0ac9b68cb8736202f0ec171c74f36cef22bca84d89f7704d356c2ee29fb9cb2d7ac935e98cf76079500bd8ed6799067033
+  metadata.gz: c410272886ffe376089154a6499ccb9da9634732b01b8c84c45627e6a3c5ff73b47106c6680095a3529f01d3f94ab928828c882a50b8f39e5164004063c14bae
+  data.tar.gz: 6d9d84f9fd041b28a543dad0d458a5feed9ac0867062a82cd2af7926adda5d2e91be0162f972154b87cbb51442f1c49aadfb76dee30932406e593648568e0207

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 0.5.5
+* Add: Allow to start/stop/restart particular service in the app target (example: `$ procsd start web`)
+* Add: RuntimeMaxSec option for process
+
 ## 0.5.4
 * Add: information how to use SSL integration with Cloudflare CDN enabled
 * Add: procsd config certbot_command command

data/README.md

@@ -70,13 +70,14 @@ You can provide additional options for `create` command:
 ### Start application
 > Other control commands: `stop` and `restart`
 
+> You can start/stop/restart a particular process by providing it's name, i.e.: `$ procsd restart worker`
+
 ```
 deploy@server:~/sample_app$ procsd start
 
 Started app services (sample_app.target)
 ```
 
-
 ### Check the status
 > You can filter processes, like `$ procsd status worker` (show status only for worker processes) or `$ procsd status worker.2` (show status only for worker.2 process)
 
@@ -320,7 +321,7 @@ Everything is done. Start app services (`procsd start`) and go to `http://my-dom
 
 #### Auto SSL using Certbot
 
-To generate Nginx config with free SSL certificate (from [Let’s Encrypt](https://letsencrypt.org/)) included, you need to install [Certbot](https://certbot.eff.org/) on the remote server first:
+To generate Nginx config with free SSL certificate (from [Let’s Encrypt](https://letsencrypt.org/)) included, you need to install [Certbot](https://certbot.eff.org/) on the remote server first. For Ubuntu 18.04 (check here instructions for other versions https://certbot.eff.org/lets-encrypt/ubuntufocal-nginx):
 
 ```bash
 $ sudo apt install software-properties-common
@@ -519,9 +520,9 @@ Execute: journalctl --no-pager --no-hostname --all --output short-iso -n 3 --uni
 
 * You can use extended format of processes commands inside `procsd.yml` to provide additional restart/stop commands for each process:
 
-> All possible options: `ExecStart`, `ExecReload` and `ExecStop`
+> All possible options: [ExecStart](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=) (default command to start a process), [ExecReload](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecReload=), and [ExecStop](https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStop=).
 
-> If procsd.yml has `processes:` option defined, then content of Procfile will be ignored
+> If procsd.yml has `processes:` option defined, then content of Procfile (if it exists) will be ignored.
 
 ```yml
 app: sample_app
@@ -534,6 +535,18 @@ processes:
 
 Why? For example default Ruby on Rails application server [Puma](http://puma.io/) supports [Phased or Rolling restart](https://github.com/puma/puma/blob/master/docs/restart.md#normal-vs-hot-vs-phased-restart) feature. If you provide separate `ExecReload`command for a process, then this command will be called while executing `$ procsd restart` by systemd instead of just killing and starting process again.
 
+* Another option you can provide for each process is [RuntimeMaxSec](https://www.freedesktop.org/software/systemd/man/systemd.service.html#RuntimeMaxSec=). It is used to automatically restart a process every N period of time. Could be useful for worker types of processes (like Sidekiq) where process memory could increase while running:
+
+> Example values for RuntimeMaxSec: `30s` (30 seconds), `5m` (5 minutes), `3h` (3 hours), `1d` (1 day).
+
+```yml
+app: sample_app
+processes:
+  web:
+    ExecStart: bundle exec rails server -p $PORT
+    RuntimeMaxSec: 12h
+```
+
 * If you use Nginx integration but default Nginx requests timeout (60s) is too small for you, [you can set a custom timeout](https://serverfault.com/a/777753) in the global Nginx config.
 
 

data/lib/procsd/cli.rb

@@ -105,44 +105,67 @@ module Procsd
     end
 
     desc "start", "Start app services"
-    def start
+    def start(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      say "Note: app target #{target_name} already started/active" if target_active?
-      if execute %W(sudo systemctl start #{target_name})
-        say("Started app services (#{target_name})", :green)
+      if service_name
+        full_name = to_full_name(service_name)
+        say "Note: app service #{full_name} already started/active" if service_active?(full_name)
+        if execute %W(sudo systemctl start #{full_name} --all)
+          say("Started app service (#{full_name})", :green)
+        end
+      else
+        say "Note: app target #{target_name} already started/active" if target_active?
+        if execute %W(sudo systemctl start #{target_name})
+          say("Started app services (#{target_name})", :green)
+        end
       end
     end
 
     desc "stop", "Stop app services"
-    def stop
+    def stop(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      say "Note: app target #{target_name} already stopped/inactive" if !target_active?
-      if execute %W(sudo systemctl stop #{target_name})
-        say("Stopped app services (#{target_name})", :green)
+      if service_name
+        full_name = to_full_name(service_name)
+        say "Note: app service #{full_name} already stopped/inactive" if !service_active?(full_name)
+        if execute %W(sudo systemctl stop #{full_name} --all)
+          say("Stopped app service (#{full_name})", :green)
+        end
+      else
+        say "Note: app target #{target_name} already stopped/inactive" if !target_active?
+        if execute %W(sudo systemctl stop #{target_name})
+          say("Stopped app services (#{target_name})", :green)
+        end
       end
     end
 
     desc "restart", "Restart app services"
-    def restart
+    def restart(service_name = nil)
       preload!
       say_target_not_exists and return unless target_exist?
 
-      # If one of the child services of a target has `ExecReload` and `ReloadPropagatedFrom`
-      # options defined, then use `reload-or-restart` to call all services (not the main target)
-      # because of systemd bug https://github.com/systemd/systemd/issues/10638
-      success =
-        if has_reload?
-          execute %W(sudo systemctl reload-or-restart #{app_name}-* --all)
-        else
-          execute %W(sudo systemctl restart #{target_name})
+      if service_name
+        full_name = to_full_name(service_name)
+        if execute %W(sudo systemctl reload-or-restart #{full_name} --all)
+          say("Restarted app service (#{full_name})", :green)
         end
+      else
+        # If one of the child services of a target has `ExecReload` and `ReloadPropagatedFrom`
+        # options defined, then use `reload-or-restart` to call all services (not the main target)
+        # because of systemd bug https://github.com/systemd/systemd/issues/10638
+        success =
+          if has_reload?
+            execute %W(sudo systemctl reload-or-restart #{app_name}-* --all)
+          else
+            execute %W(sudo systemctl restart #{target_name})
+          end
 
-      if success
-        say("Restarted app services (#{target_name})", :green)
+        if success
+          say("Restarted app services (#{target_name})", :green)
+        end
       end
     end
 
@@ -159,7 +182,7 @@ module Procsd
         command = %w(systemctl status --no-pager --output short-iso --all)
       end
 
-      command << (options["target"] ? target_name : "#{app_name}-#{service_name}*")
+      command << (options["target"] ? target_name : to_full_name(service_name))
       execute command, type: :exec
     end
 
@@ -376,10 +399,18 @@ module Procsd
       system "systemctl", "is-active", "--quiet", target_name
     end
 
+    def service_active?(service_name)
+      system "systemctl", "is-active", "--quiet", service_name
+    end
+
     def target_name
       "#{app_name}.target"
     end
 
+    def to_full_name(service_name)
+      "#{app_name}-#{service_name}*"
+    end
+
     def app_name
       @config[:app]
     end

data/lib/procsd/templates/service.erb

@@ -18,6 +18,10 @@ ExecStop=/bin/bash -lc '<%= stop %>'
 ExecReload=/bin/bash -lc '<%= reload %>'
 <% end -%>
 
+<% if max_sec = config["commands"]["RuntimeMaxSec"] -%>
+RuntimeMaxSec=<%= max_sec %>
+<% end -%>
+
 Restart=always
 RestartSec=1
 TimeoutStopSec=30

data/lib/procsd/version.rb

@@ -1,3 +1,3 @@
 module Procsd
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procsd
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor