daemontools 0.1.3 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3f78e344526e58126e95c1a9359e456eb99444c3
+  data.tar.gz: 658709fb1dd2e52a45fc476e14fd6276cf1d4898
+SHA512:
+  metadata.gz: f552266c433984fa406203d175618731bf1d5e960e0d3504d1014c31b292cce80c394440df4fbc1eb3acc7f6acc8d2e7cdec725cb74c70618684dff9584d310b
+  data.tar.gz: c51b2afc52bf61a3c5c4d3a4b9408d709c189cdcf11445adf78c68c000fbe1da4e0514228d5ef655f1a6fcce93d6a2c8814d908f79b81c3aad90662550980924

data/bin/daemontools-gen

@@ -8,4 +8,4 @@ roles = ARGV[1] || ""
 puts "Building svc services for roles #{roles} .."
 
 builder = Daemontools::Builder.new("#{Dir.pwd}/config/services.rb")
-builder.gen(roles, environment)
+builder.gen(roles, environment)

data/lib/daemontools.rb

@@ -9,11 +9,11 @@ module Daemontools
   end
   @svc_root = '/etc/service'
   @log_root = '/var/log/svc'
-  
+
   def self.exists?(name)
     check_service_exists(name, false)
   end
-  
+
   def self.status(name)
     check_service_exists(name)
     r = `sudo svstat #{@path} 2>&1`
@@ -21,27 +21,27 @@ module Daemontools
     raise "Unknown status" unless r.match(/.*?:\s*(\S+).*\s(\d+) seconds.*/)
     [$1, $2.to_i]
   end
-  
+
   def self.up?(name)
     status(name)[0] == "up"
   end
-  
+
   def self.down?(name)
     status(name)[0] == "down"
   end
-  
+
   def self.stop(name)
     run_svc(name, 'd')
   end
-  
+
   def self.start(name)
     run_svc(name, 'u')
   end
-  
+
   def self.restart(name)
     run_svc(name, 't')
   end
-  
+
   def self.add_empty(name)
     path = "#{@svc_root}/#{name}"
     Dir.mkdir(path) unless Dir.exists?(path)
@@ -55,7 +55,7 @@ module Daemontools
     stop(name)
     true
   end
-  
+
   def self.add(name, command, options = {})
     @name = name
     @command = command
@@ -63,7 +63,9 @@ module Daemontools
     @pre_command = options[:pre_command]
     @sleep = options[:sleep] || 3
     @path = "#{@svc_root}/#{name}"
-    
+    @change_user_command = options[:change_user_command]
+    @ulimit = options[:ulimit]
+
     if Dir.exists?(@path)
       stop(name)
     else
@@ -73,7 +75,7 @@ module Daemontools
     Dir.mkdir("#{@path}/log") unless Dir.exists?("#{@path}/log")
     File.open("#{@path}/log/run", 'w', 0755) {|f| f.write(run_template('log.erb'))}
     File.open("#{@path}/run", 'w', 0755) {|f| f.write(run_template('run.erb'))}
-    
+
     unless options[:not_wait]
       wait_timeout = options[:wait_timeout] || 10
       now = Time.now.to_f
@@ -82,10 +84,10 @@ module Daemontools
         sleep 0.1
       end
     end
-    
+
     true
   end
-  
+
   def self.delete(name)
     check_service_exists(name)
     stop(name)
@@ -93,33 +95,33 @@ module Daemontools
     raise r if $?.exitstatus != 0
     true
   end
-  
+
   def self.run_status(name)
     check_service_exists(name)
     File.exists?("#{@path}/down") ? "down" : "up"
   end
-  
+
   def self.run_status_up?(name)
     run_status(name) == "up"
   end
-  
+
   def self.run_status_down?(name)
     run_status(name) == "down"
   end
-  
+
   def self.make_run_status_up(name)
     File.delete("#{@path}/down")
     true
   end
-  
+
   def self.make_run_status_down(name)
     check_service_exists(name)
     File.open("#{@path}/down", 'w') {|f| f.write('')}
     true
   end
-  
+
   private
-  
+
   def self.check_service_exists(name, raise_error = true)
     @path = "#{@svc_root}/#{name}"
     if raise_error
@@ -128,7 +130,7 @@ module Daemontools
       Dir.exists?(@path)
     end
   end
-  
+
   def self.run_svc(name, command)
     check_service_exists(name)
     r = `sudo svc -#{command} #{@path} 2>&1`
@@ -136,7 +138,7 @@ module Daemontools
     raise r if ! r.empty?
     true
   end
-  
+
   def self.run_template(template_name)
     @user = Etc.getlogin
     template_path = File.expand_path(File.dirname(__FILE__))+'/../templates/'+template_name

data/lib/daemontools/service_builder.rb

@@ -1,34 +1,36 @@
 module Daemontools
   class Builder
-    attr_accessor :environment,  :all_roles, :services, :curr_service_name
-    
+    attr_accessor :environment, :all_roles, :services, :curr_service_name, :change_user_command, :ulimit
+
     def initialize(filename)
       @all_roles = []
       @services = {}
+      @change_user_command = 'setuidgid'
+      @ulimit = {}
       eval(File.read(filename), binding())
     end
-    
+
     def run_command(command_name, param)
       self.class.send(:define_method, command_name) do |task, options = {}|
         p = param.gsub(':task', task)
-        options.each {|key, val| p.gsub!(":#{key}", val.to_s) }
+        options.each { |key, val| p.gsub!(":#{key}", val.to_s) }
         command(p, options)
       end
     end
-    
+
     def command(param, options = {})
       Daemontools.stop(@curr_service_name) if Daemontools.exists?(@curr_service_name)
       @command = param.gsub(':environment', @environment)
       template_path = File.expand_path(File.dirname(__FILE__))+'/../../templates/rvm.erb'
       cmd = ERB.new(File.read(template_path)).result(binding())
-      Daemontools.add(@curr_service_name, cmd)
+      Daemontools.add(@curr_service_name, cmd, { :change_user_command => @change_user_command, :ulimit => @ulimit })
       Daemontools.make_run_status_up(@curr_service_name)
       Daemontools.start(@curr_service_name)
     end
-    
+
     def service(name, opts = {}, &block)
       if opts[:roles]
-        opts[:roles].each do |role| 
+        opts[:roles].each do |role|
           role = role.to_sym
           @all_roles << role unless @all_roles.member?(role)
           @services[role] = [] unless @services[role]
@@ -38,15 +40,23 @@ module Daemontools
         raise "service without roles"
       end
     end
-    
+
     def gen(roles, env)
       @environment = env
-      roles.split(',').each do |role| 
+      roles.split(',').each do |role|
         (@services[role.to_sym] || []).each do |service|
           @curr_service_name = service[0].to_s
-          service[1].call 
+          service[1].call
         end
       end
     end
+
+    def change_user_command(cmd)
+      @change_user_command = cmd
+    end
+
+    def ulimit(opt, val)
+      @ulimit[opt] = val
+    end
   end
-end
+end

data/lib/daemontools/version.rb

@@ -1,3 +1,3 @@
 module Daemontools
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/templates/run.erb

@@ -1,5 +1,8 @@
 #!/bin/sh
+<% @ulimit.each do |k,v| %>
+ulimit -<%=k%> <%=v%>
+<% end %>
 <%= "sleep #{@sleep}" if @sleep && @sleep.to_i > 0 %>
 exec 2>&1
 <%= @pre_command if @pre_command %>
-exec <%= "setuidgid #{@user}" if @user %> <%= @command %>
+exec <%= "#{@change_user_command} #{@user}" if @user %> <%= @command %>

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: daemontools
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - sh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Distributed storage
@@ -51,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,32 +62,25 @@ files:
 - templates/rvm.erb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3917808334691883764
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3917808334691883764
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Distributed storage
 test_files: []