daemontools 0.2.0 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfea32b1c19fb71a22c1e6fcd414522b7470cec233ddd85e54ee00c5e4eb82e
-  data.tar.gz: 5f2bd483ce8e98235039bd4c084d84a6b6cf0f2612f997be167a7b8e705f096a
+  metadata.gz: f5703423d017dfd15356942bfb9c15b1bf90a0066e0ee3cb44d6465c0028a926
+  data.tar.gz: f7cb58a362f20b50c777a935b9468d7ca290b6d1f9c655321dc37d0b3103b069
 SHA512:
-  metadata.gz: d2e573d9827f32d2ed84f93d4423526f416767ea8117aca68e544b931a9f211e138efa38bcd0d87e221ba98d7b9d6252f22131a8ff55f46bc7bf8981757366e8
-  data.tar.gz: 419eee00aef1789ea1ca2705548b0f0f385d5dd96e64165f83cdfee03202821449ea62e61ab6731ca5b7b07db38cdaefd6f5f38e0c492e8c1792ccbc09376beb
+  metadata.gz: 990027123b11e7049fe904a19ac9fe30ae0fdbd6823a61d3640d0e9506f95daec95d6d7fa09878ef18d8fcf89a1d5682aec99591eb35e6134a16a4901cdfd27c
+  data.tar.gz: 5d668f9a9bcd887332110e549e738a29bbfcce6e696cf45c57fa27545d5d54a3d2f91116562cefdeb81dc26d349b423ae1fd69e4688a4a23caf1510d2a9343b0

data/bin/daemontools-gen

@@ -10,13 +10,22 @@ puts "Building svc services for roles #{roles} .."
 old_path = ARGV[2] || ''
 new_path = ARGV[3] || ''
 
-if old_path.empty? || new_path.empty?
-  builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
-  builder.gen(roles, environment)
-else
+def need_remove_old_services?(old_path, new_path)
+  # If no new path there is no reason to try remove old services
+  return false if new_path.nil? || new_path.empty?
+  # If no old path there is no reason to try remove old services
+  return false if old_path.nil? || old_path.empty?
+  # Check if config files are exists
+  File.exist?("#{old_path}/config/services.rb") && File.exist?("#{new_path}/config/services.rb")
+end
+
+if need_remove_old_services?(old_path, new_path)
   previous_builder = Daemontools::Builder.new("#{old_path}/config/services.rb")
   current_builder = Daemontools::Builder.new("#{new_path}/config/services.rb")
   remover = Daemontools::Remover.new(roles, previous_builder, current_builder)
   remover.remove_unused_services
   current_builder.gen(roles, environment)
+else
+  builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
+  builder.gen(roles, environment)
 end

data/lib/daemontools.rb

@@ -6,15 +6,20 @@ require 'erb'
 
 module Daemontools
   class << self
-    attr_accessor :svc_root, :log_root
+    attr_accessor :svc_root, :log_root, :tmp_root
   end
   @svc_root = '/etc/service'
   @log_root = '/var/log/svc'
+  @tmp_root = '/tmp'
 
   def self.exists?(name)
     check_service_exists(name, false)
   end
 
+  def self.tmp_exists?(name)
+    Dir.exists?("#{@tmp_root}/daemontools_service_#{name}")
+  end
+
   def self.status(name)
     check_service_exists(name)
     r = `sudo svstat #{@path} 2>&1`
@@ -57,6 +62,29 @@ module Daemontools
     true
   end
 
+  def self.add_empty_tmp(name)
+    path = "#{@tmp_root}/daemontools_service_#{name}"
+    Dir.mkdir(path) unless Dir.exists?(path)
+    true
+  end
+
+  def self.move_tmp(name)
+    tmp_path = "#{@tmp_root}/daemontools_service_#{name}"
+    svc_path = "#{@svc_root}/#{name}"
+
+    r = `mv #{tmp_path} #{svc_path}`
+    raise r if $?.exitstatus != 0
+    raise r if ! r.empty?
+
+    now = Time.now.to_f
+    while `sudo svstat #{svc_path} 2>&1`.match(/unable to open/i)
+      raise "Timeout wait for svc add service" if Time.now.to_f - now > 10
+      sleep 0.1
+    end
+
+    true
+  end
+
   def self.add(name, command, options = {})
     @name = name
     @command = command
@@ -91,7 +119,7 @@ module Daemontools
   end
 
   def self.delete(name, rm_cmd = nil)
-    check_service_exists(name)
+    return false unless exists?(name)
     stop(name)
     cmd = rm_cmd.nil? ? "sudo rm -rf #{@path} 2>&1" : "#{rm_cmd} #{@path}"
     r = `#{cmd}`

data/lib/daemontools/capistrano.rb

@@ -16,10 +16,11 @@ Capistrano::Configuration.instance(:must_exist).load do
           path = fetch(:previous_release)
           puts "rollback 1"
         else
+          previous_release_path = fetch(:previous_release)
           path = fetch(:release_path)
 
           servers.each do |server, roles|
-            command = "cd #{path} && bundle exec daemontools-gen #{fetch :rails_env, "production"} #{roles.join(',')} #{current_path} #{release_path}"
+            command = "cd #{path} && bundle exec daemontools-gen #{fetch :rails_env, "production"} #{roles.join(',')} #{previous_release_path} #{current_path}"
             run command, :hosts => server
           end
         end

data/lib/daemontools/version.rb

@@ -1,3 +1,3 @@
 module Daemontools
-  VERSION = "0.2.0"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemontools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.6
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Distributed storage