smartguard 0.2.10 → 0.3

data/bin/smartguard

@@ -1,63 +1,196 @@
 #!/usr/bin/env ruby
 
 require 'smartguard'
+require 'trollop'
 require 'colored'
-require 'dante'
 
-Smartkiosk::Common::Patches.dante_should_log_with Smartguard::Logging.logger
+def start_application(application, opts, &block)
 
-runner = Dante::Runner.new('smartguard')
-runner.description = "Smartkiosk services control daemon"
+  Smartguard::Logging.logger.info "Starting application"
 
-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
+  unless opts[:pid].nil?
+    begin
+      File.open(opts[:pid], "w") do |io|
+        io.write Process.pid.to_s
+      end
+    rescue => e
+      Smartguard::Logging.logger.error "Unable to write pidfile: #{e}"
+    end
   end
-  opts.on("-x", "--path PATH", String, "Path to application") do |x|
-    options[:path] = x
+
+  application = application.new opts[:path]
+
+  signal_handler = ->(signal) do
+    begin
+      if Smartguard.shutting_down
+        Smartguard::Logging.logger.info "Okay, okay."
+      else
+        Smartguard::Logging.logger.info "Catched signal, shutting down"
+
+        Smartguard.shutting_down = true
+        Smartguard::Logging.logger.info "Stopping services"
+        application.stop_services
+      end
+
+    rescue => e
+      Smartguard::Logging.logger.error "Shutdown failed: #{e}"
+
+    ensure
+      exit 1
+    end
   end
 
-  opts.on("-p", "--port PORT", Integer, "Port to run DRB (default: #{options[:port]})") do |x|
-    options[:port] = x
+  trap :HUP, signal_handler
+  trap :INT, signal_handler
+  trap :QUIT, signal_handler
+  trap :PIPE, signal_handler
+  trap :TERM, signal_handler
+  Smartguard::ProcessManager.init
+
+  at_exit do
+    begin
+      Smartguard::Logging.logger.info "Killing any remaining processes"
+    ensure
+      Process.kill :KILL, 0
+    end
   end
 
-  opts.on("-v", "--version", "Output version") do |x|
-    options[:version] = x
+  Smartguard::Logging.logger.info "Starting services"
+
+  begin
+    application.start_services do
+      Smartguard::Logging.logger.error "Startup failed, cleaning up and exiting"
+      application.stop_services
+      exit 1
+    end
+  rescue => e
+    Smartguard::Logging.logger.error "Exception catched during service startup: #{e}"
+    exit 1
   end
 
-  opts.on("-d", "--development", "Run in development environment") do |x|
-    options[:development] = x
+  Smartguard::Logging.logger.info "Services started"
+
+  DRb.start_service("druby://localhost:#{opts[:port]}", application)
+  Smartguard::Logging.logger.info "Smartguard ready"
+
+  yield if block_given?
+
+  DRb.thread.join
+end
+
+trap :TTIN do
+  Thread.list.each do |thread|
+    puts "Thread #{thread}:"
+    if thread.backtrace
+      puts thread.backtrace.join("\n")
+    else
+      puts "<no backtrace available>"
+    end
   end
 end
 
-runner.execute do |opts|
-  abort "Smartguard version: #{Smartguard::VERSION}" if opts[:version]
+opts = Trollop.options do
+  version "Smartguard #{Smartguard::VERSION}"
 
-  abort "You should specify application (--app)" if opts[:application].blank?
+  opt :app, "Application to use", type: String
+  opt :path, "Path to application", type: String
+  opt :port, "Port to run DRB", default: 10000
+  opt :pid, "Pid file name", type: String
+  opt :log, "Log file name", type: String
+  opt :development, "Run in the development environment"
+  opt :daemon, "Daemonize Smartguard after initialization"
+  opt :kill, "Kill Smartguard by pidfile"
+end
 
-  if opts[:path].blank?
-    if opts[:development]
-      opts[:path] = Dir.getwd
-    else
-      abort "You should specify application path (--path)" if opts[:path].blank?
+if opts[:kill]
+  Trollop::die :pid, "must be specified to kill" if opts[:pid].nil?
+
+  puts "Waiting for Smartguard to die."
+  begin
+    pid = File.read(opts[:pid]).to_i
+
+    Process.kill :TERM, pid
+    loop do
+      Process.kill 0, pid
+      sleep 0.5
     end
+  rescue
   end
 
-  application = Smartguard::Applications.const_get(opts[:application].camelize) rescue nil
+  exit 0
+end
+
+Trollop::die :app, "must be specified" if opts[:app].nil?
 
-  abort "Application `#{opts[:application]}` not supported" if application.nil?
+begin
+  application = Smartguard::Applications.const_get opts[:app].camelize
+rescue
+  Trollop::die :app, "is not supported"
+end
 
+if opts[:path].nil?
   if opts[:development]
-    Smartguard.environment = :development
+    opts[:path] = Dir.getwd
   else
-    Smartguard.environment = :production
+    Trollop::die :path, "must be specified in production"
   end
+end
 
-  application = application.new(opts[:path])
-  DRb.start_service("druby://localhost:#{opts[:port]}", application)
-  application.start_services
-  DRb.thread.join
+if opts[:development]
+  Smartguard.environment = :development
+else
+  Smartguard.environment = :production
+end
+
+if opts[:log].nil?
+  Trollop::die :log, "must be specified for daemon" if opts[:daemon]
+else
+  Smartguard::Logging.destination = opts[:log]
+end
+
+Smartguard::Logging.init
+Smartguard::Logging.logger.info "Initializing Smartguard"
+
+if opts[:daemon]
+  rd, wr = IO.pipe
+
+  pid = Process.fork
+  if pid.nil?
+    begin
+      Process.setsid
+      Dir.chdir '/'
+      File.umask 0
+      File.open("/dev/null", "r+") do |null|
+        [ STDIN, STDOUT, STDERR ].each do |io|
+          io.reopen null
+        end
+      end
+
+      rd.close
+
+      start_application(application, opts) do
+        wr.puts "1"
+        wr.flush
+        wr.close
+      end
+
+      exit 0
+    rescue
+      exit 1
+    end
+  end
+
+  wr.close
+
+  begin
+    rd.readline
+
+    puts "smartguard started"
+    exit 0
+  rescue => e
+    puts "smartguard initialization failed"
+    exit 1
+  end
+else
+  start_application application, opts
 end

data/bin/smartguardctl

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+
+require "trollop"
+require "smartguard"
+
+module CommandHandler
+  def self.cmd_start(drb)
+    status = drb.start_services
+  end
+
+  def self.cmd_stop(drb)
+    drb.stop_services
+  end
+
+  def self.cmd_restart(drb)
+    drb.restart
+  end
+
+  def self.cmd_status(drb)
+    status = drb.status
+
+    status.each do |service, (pid, active)|
+      printf "%-16s: ", service
+
+      if active
+        puts "running, pid #{pid}"
+      else
+        puts "stopped"
+      end
+    end
+  end
+
+  def self.cmd_switch_release(drb)
+    if ARGV.empty?
+      warn "release must be specified"
+      exit 1
+    end
+
+    release = ARGV.shift
+    status = drb.switch_release release
+    if status
+      puts "releases switched"
+    else
+      warn "switch failed"
+      exit 1
+    end
+  end
+end
+
+opts = Trollop.options do
+  version "Smartguard CLI #{Smartguard::VERSION}"
+  opt :port, "DRB Port", default: 10000
+  stop_on_unknown
+end
+
+drb = DRb::DRbObject.new_with_uri "druby://localhost:#{opts[:port]}"
+
+if ARGV.empty?
+  warn "command must be specified"
+  exit 1
+end
+
+cmd = :"cmd_#{ARGV.shift}"
+
+unless CommandHandler.respond_to? cmd
+  warn "unsupported command"
+  exit 1
+end
+
+CommandHandler.send cmd, drb

data/lib/smartguard.rb

@@ -22,5 +22,8 @@ require 'smartguard/applications/smartkiosk/thin'
 module Smartguard
   class << self
     attr_accessor :environment
+    attr_accessor :shutting_down
   end
+
+  self.shutting_down = false
 end

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

@@ -11,11 +11,17 @@ module Smartguard
           log_path    = @path.join('log/sidekiq_log')
           pidfile     = @path.join('tmp/pids/sidekiq.pid')
 
+          opts = []
+          if Smartguard.environment == :production
+            opts << "-L"
+            opts << "#{log_path}"
+          end
+
           FileUtils.rm_f pidfile
           if !run(@path,
                   {},
                   "bundle", "exec",
-                  "sidekiq", "-e", Smartguard.environment.to_s, "--config=#{config_path}", "--pidfile=#{pidfile}"
+                  "sidekiq", "-e", Smartguard.environment.to_s, "--config=#{config_path}", "--pidfile=#{pidfile}", *opts
                  )
             return false
           end

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

@@ -8,8 +8,13 @@ module Smartguard
           log_file    = @path.join('log/smartware.log')
           config_file = @path.join('config/services/smartware.yml')
 
+          opts = []
+          if Smartguard.environment == :production
+            opts << "--log=#{log_file}"
+          end
+
           Logging.logger.info "Starting smartware"
-          if !run(@path, {}, "bundle", "exec", "smartware", "--log=#{log_file}", "--config-file=#{config_file}")
+          if !run(@path, {}, "bundle", "exec", "smartware", "--config-file=#{config_file}", *opts)
             return false
           end
 

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

@@ -12,18 +12,22 @@ module Smartguard
             Logging.logger.info "Starting thin"
           end
 
+          log_path = @path.join('log/thin.log')
+
           if !run(@path,
                   {},
                   "bundle", "exec",
-                  "thin", "-e", Smartguard.environment.to_s, "-p", 3000,
+                  "thin", "-e", Smartguard.environment.to_s, "-p", "3000", "-l", "#{log_path}",
                   "start"
                  )
             return false
           end
 
-          without_respawn do
-            wait_for_port port
+          result = without_respawn do
+            wait_for_port 3000
           end
+
+          result
         end
 
         def stop

data/lib/smartguard/process.rb

@@ -105,7 +105,7 @@ module Smartguard
       @active = false
       @pid = nil
 
-      died if @wanted && !@starting
+      died if @wanted && !@starting && !Smartguard.shutting_down
     end
 
     if defined? Bundler

data/lib/smartguard/process_manager.rb

@@ -33,7 +33,8 @@ module Smartguard
       end
     end
 
+    def self.init
+      trap :CHLD, ProcessManager.method(:handle_sigchld)
+    end
   end
-
-  trap 'CHLD', ProcessManager.method(:handle_sigchld)
 end

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.2.10"
+  VERSION = "0.3"
 end

data/smartguard.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'smartkiosk-common'
   gem.add_dependency 'i18n'
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'dante'
+  gem.add_dependency 'trollop'
   gem.add_dependency 'colored'
 
   gem.add_development_dependency 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70155562307000 !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: *70155562307000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70155562306420 !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: *70155562306420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70155562305820 !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: *70155562305820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dante
-  requirement: &70155562304860 !ruby/object:Gem::Requirement
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155562304860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70155562304200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70155562304200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70155562303400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,12 +101,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70155562303400
+  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
 executables:
 - smartguard
+- smartguardctl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -91,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - bin/smartguard
+- bin/smartguardctl
 - lib/smartguard.rb
 - lib/smartguard/application.rb
 - lib/smartguard/applications/smartkiosk.rb
@@ -124,9 +156,8 @@ 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
 test_files: []
-has_rdoc: