smartguard 0.1.8 → 0.2.0

data/bin/smartguard

@@ -8,6 +8,7 @@ runner.description = "Smartkiosk services control daemon"
 
 runner.with_options do |opts|
   options[:port] = 10000
+  options[:development] = false
 
   opts.on("-a", "--app APPLICATION", String, "Application to use") do |x|
     options[:application] = x
@@ -20,38 +21,40 @@ runner.with_options do |opts|
     options[:port] = x
   end
 
-  opts.on("-s", "--start", "Start all services and exit") do |x|
-    options[:start] = x
-  end
-
-  opts.on("-S", "--stop", "Stop all services and exit") do |x|
-    options[:stop] = x
-  end
-
   opts.on("-v", "--version", "Output version") do |x|
     options[:version] = x
   end
+
+  opts.on("-d", "--development", "Run in development environment") do |x|
+    options[:development] = x
+  end
 end
 
 runner.execute do |opts|
   abort "Smartguard version: #{Smartguard::VERSION}" if opts[:version]
 
   abort "You should specify application (--app)" if opts[:application].blank?
-  abort "You should specify application path (--path)" if opts[:path].blank?
+
+  if opts[:path].blank?
+    if opts[:development]
+      opts[:path] = Dir.getwd
+    else
+      abort "You should specify application path (--path)" if opts[:path].blank?
+    end
+  end
 
   application = Smartguard::Applications.const_get(opts[:application].camelize) rescue nil
 
   abort "Application `#{opts[:application]}` not supported" if application.nil?
 
-  application = application.new(opts[:path])
-
-  if opts[:stop]
-    application.stop_services
-  elsif opts[:start]
-    application.start_services
+  if opts[:development]
+    Smartguard.environment = :development
   else
-    application.warm_up
-    DRb.start_service("druby://localhost:#{opts[:port]}", application)
-    DRb.thread.join
+    Smartguard.environment = :production
   end
-end
+
+  application = application.new(opts[:path])
+  DRb.start_service("druby://localhost:#{opts[:port]}", application)
+  application.start_services
+  DRb.thread.join
+end

data/lib/smartguard.rb

@@ -2,18 +2,23 @@ require 'active_support/all'
 require 'pathname'
 require 'fileutils'
 require 'drb'
+require "socket"
 
 require 'smartguard/version'
 require 'smartguard/logging'
 require 'smartguard/process'
+require 'smartguard/process_manager'
 require 'smartguard/application'
 require 'smartguard/client'
 
 require 'smartguard/applications/smartkiosk'
 require 'smartguard/applications/smartkiosk/sidekiq'
 require 'smartguard/applications/smartkiosk/smartware'
-require 'smartguard/applications/smartkiosk/cronic'
+require 'smartguard/applications/smartkiosk/scheduler'
 require 'smartguard/applications/smartkiosk/thin'
 
 module Smartguard
+  class << self
+    attr_accessor :environment
+  end
 end

data/lib/smartguard/application.rb

@@ -2,10 +2,17 @@ module Smartguard
   class Application
     def initialize(path)
       @base_path     = Pathname.new(File.absolute_path path)
-      @current_path  = @base_path.join('current')
-      @releases_path = @base_path.join('releases')
-      @shared_path   = @base_path.join('shared')
-      @active_path   = File.readlink @current_path
+      if Smartguard.environment == :production
+        @current_path  = @base_path.join('current')
+        @releases_path = @base_path.join('releases')
+        @shared_path   = @base_path.join('shared')
+        @active_path   = File.readlink @current_path
+      else
+        @current_path  = @base_path
+        @releases_path = @base_path
+        @shared_path   = @base_path
+        @active_path   = @base_path
+      end
     end
   end
 end

data/lib/smartguard/applications/smartkiosk.rb

@@ -3,43 +3,35 @@ module Smartguard
     class Smartkiosk < Smartguard::Application
       def initialize(*args)
         super
-        @head_path = @base_path.join('head')
+
+        if Smartguard.environment == :production
+          @head_path = @base_path.join('head')
+        else
+          @head_path = @base_path
+        end
+
+        @services = {
+          smartware: Smartware.new(wrap_path),
+          sidekiq: Sidekiq.new(wrap_path),
+          thin: Thin.new(wrap_path),
+          scheduler: Scheduler.new(wrap_path),
+        }
       end
 
       def services
-        [:sidekiq, :smartware, :cronic, :thin]
+        @services.keys
       end
 
       def status
         data = {}
 
-        services.each do |s|
-          service = send(s)
-
-          data[s] = [service.pid, service.active?]
+        @services.each do |key, service|
+          data[key] = [ service.pid, service.active? ]
         end
 
         data
       end
 
-      def warm_up
-        Logging.logger.info 'Warming up'
-
-        services.each do |s|
-          service = send(s)
-
-          if !service.active?
-            if !service.start
-              stop_services
-              puts "Could not be started: #{s}"
-              exit
-            end
-          else
-            Logging.logger.info "#{s} is already active: #{service.pid}"
-          end
-        end
-      end
-
       def restart(path=nil)
         stop_services(path)
         start_services(path)
@@ -51,6 +43,10 @@ module Smartguard
       end
 
       def switch_release(release)
+        if Smartguard.environment != :production
+          raise "Release switching is only supported in the production environment."
+        end
+
         release = release.is_a?(Symbol) ? @releases_path.join(release.to_s)
                                         : @base_path.join(release)
 
@@ -91,40 +87,30 @@ module Smartguard
       end
 
       def start_services(path=nil, &block)
-        services.each do |s|
-          if !send(s, path).start && block_given?
-            Logging.logger.debug "Startup of #{s} failed: running safety block"
-            yield 
-            return false
+        @services.each do |key, service|
+          service.path = wrap_path path
+
+          if !service.active?
+            if !service.start && block_given?
+              Logging.logger.debug "Startup of #{s} failed: running safety block"
+              yield
+              return false
+            end
           end
         end
       end
 
       def stop_services(path=nil)
-        services.each do |s|
-          send(s, path).stop
+        @services.each do |key, service|
+          service.path = wrap_path path
+
+          service.stop if service.active?
         end
       end
 
     protected
 
-      def sidekiq(path=nil)
-        Sidekiq.new wrap_path(path)
-      end
-
-      def smartware(path=nil)
-        Smartware.new wrap_path(path)
-      end
-
-      def cronic(path=nil)
-        Cronic.new wrap_path(path)
-      end
-
-      def thin(path=nil)
-        Thin.new wrap_path(path)
-      end
-
-      def wrap_path(path)
+      def wrap_path(path = nil)
         path.blank? ? @current_path : Pathname.new(path)
       end
     end

data/lib/smartguard/applications/smartkiosk/scheduler.rb

@@ -0,0 +1,26 @@
+require "fileutils"
+
+module Smartguard
+  module Applications
+    class Smartkiosk
+      class Scheduler < Process
+        def start
+          super
+
+          Logging.logger.info "Starting scheduler"
+
+          run @path, {
+              'RAILS_ENV' => Smartguard.environment.to_s
+            }, "rake", "schedule"
+        end
+
+        def stop
+          super
+
+          Logging.logger.info "Stoping scheduler"
+          kill_and_wait :TERM, 5
+        end
+      end
+    end
+  end
+end

data/lib/smartguard/applications/smartkiosk/sidekiq.rb

@@ -1,32 +1,35 @@
 module Smartguard
   module Applications
     class Smartkiosk
-      class Sidekiq < Smartguard::Process
-        def initialize(path)
-          @path        = path
-          @config_path = path.join('config/sidekiq.yml')
-          @log_path    = path.join('log/sidekiq_log')
-          @config      = YAML.load_file(@config_path) rescue {}
-        end
-
-        def pid
-          File.read(@path.join @config[:pidfile]).to_i rescue nil
-        end
-
+      class Sidekiq < Process
         def start
+          super
+
           Logging.logger.info "Starting sidekiq"
 
-          if @config[:pidfile].blank?
-            Logging.logger.warn "Sidekiq's config was not found"
+          config_path = @path.join('config/sidekiq.yml')
+          log_path    = @path.join('log/sidekiq_log')
+          pidfile     = @path.join('tmp/pids/sidekiq.pid')
+
+          FileUtils.rm_f pidfile
+          if !run(@path,
+                  {},
+                  "bundle", "exec",
+                  "sidekiq", "-e", Smartguard.environment.to_s, "--config=#{config_path}", "--pidfile=#{pidfile}"
+                 )
             return false
           end
 
-          run @path, "bundle exec sidekiq -e production --config #{@config_path} >> #{@log_path} 2>&1 &"
+          without_respawn do
+            wait_for_file pidfile
+          end
         end
 
         def stop
-          Logging.logger.info "Stoping sidekiq"
-          run @path, "bundle exec sidekiqctl stop #{@config[:pidfile]} 60"
+          super
+
+          Logging.logger.info "Stopping sidekiq"
+          kill_and_wait :TERM, 60
         end
       end
     end

data/lib/smartguard/applications/smartkiosk/smartware.rb

@@ -1,26 +1,28 @@
 module Smartguard
   module Applications
     class Smartkiosk
-      class Smartware < Smartguard::Process
-        def initialize(path)
-          @path        = path
-          @pid_file    = path.join('tmp/pids/smartware.pid')
-          @log_file    = path.join('log/smartware.log')
-          @config_file = path.join('config/smartware.yml')
-        end
+      class Smartware < Process
+        def start
+          super
 
-        def pid
-          File.read(@pid_file).to_i rescue nil
-        end
+          log_file    = @path.join('log/smartware.log')
+          config_file = @path.join('config/smartware.yml')
 
-        def start
           Logging.logger.info "Starting smartware"
-          run @path, "bundle exec smartware -d --pid=#{@pid_file} --log=#{@log_file} --config-file=#{@config_file}"
+          if !run(@path, {}, "bundle", "exec", "smartware", "--log=#{log_file}", "--config-file=#{config_file}")
+            return false
+          end
+
+          without_respawn do
+            wait_for_port 6001
+          end
         end
 
         def stop
+          super
+
           Logging.logger.info "Stoping smartware"
-          kill unless pid.blank?
+          kill_and_wait :TERM, 15
         end
       end
     end

data/lib/smartguard/applications/smartkiosk/thin.rb

@@ -1,24 +1,30 @@
 module Smartguard
   module Applications
     class Smartkiosk
-      class Thin < Smartguard::Process
-        def initialize(path)
-          @path     = path
-          @pid_file = path.join('tmp/pids/thin.pid')
-        end
-
-        def pid
-          File.read(@pid_file).to_i rescue nil
-        end
-
+      class Thin < Process
         def start
+          super
+
           Logging.logger.info "Starting thin"
-          run @path, "bundle exec thin -d -e production start"
+
+          if !run(@path,
+                  {},
+                  "bundle", "exec",
+                  "thin", "-e", Smartguard.environment.to_s, "start"
+                 )
+            return false
+          end
+
+          without_respawn do
+            wait_for_port 3000
+          end
         end
 
         def stop
+          super
+
           Logging.logger.info "Stoping thin"
-          run(@path, "bundle exec thin -d -e production stop") unless pid.blank?
+          kill_and_wait :TERM, 15
         end
       end
     end

data/lib/smartguard/process.rb

@@ -2,34 +2,157 @@ module Smartguard
   class Process
     include DRb::DRbUndumped
 
-    def run(path, command, env={})
-      result = false
+    attr_reader :pid
+    attr_accessor :path
 
-      if defined?(Bundler)
-        Bundler.with_clean_env do
-          env = ENV.to_hash.merge(env)
+    def initialize(path)
+      @active = false
+      @pid = nil
+      @path = path
+      @wanted = false
+      @starting = false
+    end
+
+    private
+
+    def run_clean(path, env={}, *command)
+      raise "process is already active" if @active
+
+      begin
+        @pid = ::Process.spawn env, *command, chdir: path
+        ProcessManager.track @pid, method(:process_died)
+        @active = true
+
+        true
+      rescue => e
+        Logging.logger.error "unable to spawn #{command[0]}: #{e}"
+        false
+      end
+    end
+
+    public
+
+    def start
+      @wanted = true
+    end
+
+    def stop
+      @wanted = false
+    end
+
+    def active?
+      @active
+    end
+
+    def wanted?
+      @wanted
+    end
+
+    protected
+
+    def died
+      Thread.new do
+        Logging.logger.warn "#{self.class.name} died, respawning"
+        start
+      end
+    end
+
+    def without_respawn(&block)
+      begin
+        @starting = true
+
+        yield
+      ensure
+        @starting = false
+      end
+    end
 
-          FileUtils.cd(path) do
-            result = Kernel.system env, command
+    def wait_for_port(port)
+      while active?
+        socket = nil
+        alive = false
+        Addrinfo.foreach("localhost", port) do |addr|
+          begin
+            socket = Socket.new addr.afamily, :STREAM
+
+            socket.connect addr.to_sockaddr
+            alive = true
+          rescue
+          ensure
+            socket.close unless socket.nil?
           end
+
+          break if alive
         end
-      else
-        env = ENV.to_hash.merge(env)
 
-        FileUtils.cd(path) do
-          result = Kernel.system env, command
+        break if alive
+        sleep 0.5
+      end
+
+      active?
+    end
+
+    def wait_for_file(file)
+      while active?
+        break if File.exists? file
+        sleep 0.5
+      end
+
+      active?
+    end
+
+    def process_died(pid)
+      @active = false
+      @pid = nil
+
+      died if @wanted && !@starting
+    end
+
+    if defined? Bundler
+      def run(*args)
+        Bundler.with_clean_env do
+          run_clean *args
         end
       end
+    else
+      alias :run :run_clean
+    end
 
-      result
+    def kill_and_wait(signal = :TERM, timeout = nil)
+      kill signal
+      wait timeout
     end
 
-    def kill
-      run @path, "kill -9 #{pid}"
+    def kill(signal = :TERM)
+      if active?
+        ::Process.kill signal, @pid
+      end
+
+      true
+    rescue
+      true
     end
 
-    def active?
-      !!::Process.getpgid(pid) rescue false
+    def wait(timeout = nil)
+      started = Time.now
+
+      while active?
+        sleep 0.5
+
+        now = Time.now
+        if !timeout.nil? && now - started > timeout
+          begin
+            @active = false
+            ProcessManager.untrack @pid
+            Process.kill :KILL, @pid
+          rescue
+          end
+
+          return true
+        end
+      end
+
+      true
     end
   end
 end

data/lib/smartguard/process_manager.rb

@@ -0,0 +1,39 @@
+module Smartguard
+  module ProcessManager
+    def self.track(pid, method)
+      @tracked ||= {}
+      @tracked[pid] = method
+    end
+
+    def self.untrack(pid)
+      @tracked ||= {}
+      @tracked.delete pid
+    end
+
+    def self.handle_sigchld(signal)
+      pids = []
+      @tracked ||= {}
+
+      begin
+        loop do
+          pid = ::Process.wait(-1, ::Process::WNOHANG)
+          break if pid.nil?
+
+          pids << pid
+        end
+      rescue => e
+      end
+
+      pids.each do |pid|
+        tracker = @tracked[pid]
+        unless tracker.nil?
+          @tracked.delete pid
+          tracker.call pid
+        end
+      end
+    end
+
+  end
+
+  trap 'CHLD', ProcessManager.method(:handle_sigchld)
+end

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70096502060460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096502060460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70096502060040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096502060040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dante
-  requirement: &70096487986260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096487986260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70096487985840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096487985840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smartguard is the Smartkiosk services control daemon
 email:
 - boris@roundlake.ru
@@ -72,13 +92,14 @@ files:
 - lib/smartguard.rb
 - lib/smartguard/application.rb
 - lib/smartguard/applications/smartkiosk.rb
-- lib/smartguard/applications/smartkiosk/cronic.rb
+- lib/smartguard/applications/smartkiosk/scheduler.rb
 - lib/smartguard/applications/smartkiosk/sidekiq.rb
 - lib/smartguard/applications/smartkiosk/smartware.rb
 - lib/smartguard/applications/smartkiosk/thin.rb
 - lib/smartguard/client.rb
 - lib/smartguard/logging.rb
 - lib/smartguard/process.rb
+- lib/smartguard/process_manager.rb
 - lib/smartguard/version.rb
 - smartguard.gemspec
 homepage: https://github.com/roundlake/smartguard
@@ -101,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Smartguard is the Smartkiosk services control daemon

data/lib/smartguard/applications/smartkiosk/cronic.rb

@@ -1,27 +0,0 @@
-module Smartguard
-  module Applications
-    class Smartkiosk
-      class Cronic < Smartguard::Process
-        def initialize(path)
-          @path     = path
-          @pid_file = path.join('tmp/pids/cronic.pid')
-          @log_file = path.join('log/cronic.log')
-        end
-
-        def pid
-          File.read(@pid_file).to_i rescue nil
-        end
-
-        def start
-          Logging.logger.info "Starting cronic"
-          run @path, "script/cronic -d -l #{@log_file} -P #{@pid_file}", 'RAILS_ENV' => 'production'
-        end
-
-        def stop
-          Logging.logger.info "Stoping cronic"
-          run @path, "script/cronic -k -P #{@pid_file}", 'RAILS_ENV' => 'production'
-        end
-      end
-    end
-  end
-end