uc 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1136a67ca433cebf902cb4bb1eacc673e61abed
-  data.tar.gz: 77019d47d98b56c17929eff36c90fd7c8aa8a487
+  metadata.gz: 0fed4c2d361dbf1a6dd608eff3b44e40f236d565
+  data.tar.gz: dc26fe4d91b8cf96e9dbd1e57fe9868acb54b955
 SHA512:
-  metadata.gz: 2f331fac3d78f17fca9267e1213d225c9b9ed0ba83ee1ea452199605a376fd02174336b4bae6cf45ace8013081f6b5b826b06c3e4ef760bc7fe7a5d9b7116cf6
-  data.tar.gz: 047df981a85aa29710c2ba2cd26e27dcc25b5c0ab716eb1d94a505b29c13801a3d16a50742921b7051a8760f4c863d6fc93b4bf2da76d9aebb02ac1442a4060c
+  metadata.gz: 39efff4eff670c6e8a1a87e801e3d478d792316ee9ccd7bdd5d6db00f32ac26a9762c0df889c5b43a4a51e50bbc8b8399191645dff3f2f005910c5a992f0ff33
+  data.tar.gz: 157870c3e3e8fac14cb918a270474591f053adc2c847e430ac074d77ae350e18afdffa0d1c274b254a213bec89cbc6ccac8baef9c7ebfa1151ea1b937b8273a2

data/bin/uc

@@ -19,10 +19,9 @@ opts_parser = OptionParser.new do |opts|
     
     banner = [] 
     banner << "Usage: uc [options] command"
-    banner << ""
-    banner << "Commands: "
-    banner << "   start stop restart status "
-    banner << "   rolling-restart "
+    banner << "Commands: start, stop, restart, status, "
+    banner << "          rolling-restart, print-config "
+    banner << " "
 
     opts.banner = banner.join("\n")
 
@@ -32,7 +31,7 @@ opts_parser = OptionParser.new do |opts|
       options[:app_dir] = path
     end 
 
-    opts.on("-e", "--environment [RAILS_ENV]" , "Set rails env") do |e|
+    opts.on("-e", "--environment [RAILS_ENV]" , "Set rails env (default: production)") do |e|
       options[:rails_env] = e 
     end 
 
@@ -41,11 +40,22 @@ opts_parser = OptionParser.new do |opts|
       exit
     end
 
+    opts.on("--use-pid", "use pid instead of lock file to check server status") do
+      options[:use_pid] = true
+    end
+
     opts.on("--debug", "Show debug messages") do
       options[:debug] = true
       logger.level = ::Logger::DEBUG
     end
 
+    opts.on("--trace", "Show debug messages and exception stack trace") do
+      options[:debug] = true
+      options[:trace] = true
+      logger.level = ::Logger::DEBUG
+    end
+
+
     opts.on_tail("-h", "--help", "Show this message") do 
       puts opts
       exit
@@ -56,13 +66,16 @@ begin
   opts_parser.parse!(ARGV)
   app_dir = options[:app_dir] || Dir.pwd
   server = ::Uc::Server.new(app_dir, rails_env: options[:rails_env], debug: options[:debug])
+  server.use_pid = options[:use_pid]
   command = ARGV.shift
 
   case command
-  when "start", "stop", "restart", "status", "print_config"
+  when "start", "stop", "restart", "status"
     server.send command.to_sym
   when "rr", "rolling-restart"
     server.rolling_restart
+  when "print-config"
+    server.print_config
   when nil
     logger.error "No command specified"
     puts opts_parser
@@ -73,7 +86,7 @@ begin
   end
 
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument, ::Uc::Error => e
-  if options[:debug]
+  if options[:trace]
     raise e
   else
     logger.error "#{e.message}"

data/lib/uc/event_stream.rb

@@ -43,7 +43,7 @@ module Uc
       end
     end
 
-    def watch(event_type, timeout: 30, recreate: true, &block)
+    def expect(event_type, timeout: 30, recreate: true, &block)
       mq.recreate if recreate
       mq.clear
       yield
@@ -52,7 +52,7 @@ module Uc
       raise uc_error(e)
     end
 
-    def watch_in_background(event_type, timeout: 30, recreate: true, &block)
+    def expect_in_background(event_type, timeout: 30, recreate: true, &block)
       begin
         mq.recreate if recreate
         mq.clear

data/lib/uc/paths.rb

@@ -46,8 +46,8 @@ module Uc
 
     def log_and_raise_errors
       if not errors.empty?
-        errors.each { |e| logger.error e }
-        raise ::Uc::Error, "exiting due to missing dirs/files"
+        errors.each { |e| logger.debug e }
+        raise ::Uc::Error, "#{errors.first}"
       end
     end
 

data/lib/uc/server.rb

@@ -14,6 +14,7 @@ module Uc
     include ::Uc::Logger
 
     attr_reader :paths, :rails_env, :app_dir
+    attr_accessor :use_pid
 
     def initialize(app_dir, rails_env: "production", debug: false)
       @app_dir = app_dir
@@ -27,7 +28,7 @@ module Uc
         puts server_status
         return
       end
-      event_stream.watch_in_background :fin do
+      event_stream.expect_in_background :fin do
         cmd %{unicorn -c #{uconfig.path} -D -E #{rails_env} }, return_output: false,
           error_msg: "error starting unicorn"
       end
@@ -43,6 +44,8 @@ module Uc
     end
 
     def status
+      paths.validate_required
+      Dir.chdir app_dir
       puts server_status
     end
 
@@ -58,7 +61,7 @@ module Uc
         start
         return
       end
-      event_stream.watch :fin do
+      event_stream.expect :fin do
         Process.kill("USR2", server_status.pid)
       end
     end
@@ -74,7 +77,7 @@ module Uc
     private
 
     def server_status
-      @server_status ||= ::Uc::Status.new(unicorn_paths)
+      @server_status ||= ::Uc::Status.new(unicorn_paths, use_pid: use_pid)
     end
 
     def paths
@@ -99,6 +102,7 @@ module Uc
 
     def init
       paths.validate_required
+      Dir.chdir app_dir
       lock.acquire
       ::Uc::Logger.event_queue = config.event_queue_name
       config.load_env
@@ -106,7 +110,10 @@ module Uc
     end
 
     def init_once
-      @init_once ||= init
+      @init_once ||= begin
+        init
+        true
+      end
     end
 
   end   

data/lib/uc/status.rb

@@ -1,15 +1,18 @@
 require 'uc/shell_helper'
+require 'uc/logger'
 
 module Uc
   class Status
 
     include ::Uc::ShellHelper
+    include ::Uc::Logger
 
     attr_reader :paths
     attr_accessor :use_pid
 
-    def initialize(unicorn_paths)
+    def initialize(unicorn_paths, use_pid: false)
       @paths =  unicorn_paths
+      @use_pid = use_pid
     end
 
     def running?
@@ -18,7 +21,18 @@ module Uc
     end
 
     def pid
-      @pid ||= read_pid
+      pid = pid_from_file
+      if pid_valid?
+        return pid
+      else
+        logger.debug "pids holding unicorn.lock => #{fuser_pids.join(' ')}"
+        logger.debug "pid from file => #{pid}"
+        raise ::Uc::Error, "stale pid #{pid}"
+      end
+    end
+
+    def pid_from_file
+      @pid_from_file ||= read_pid
     end
 
     def stopped?
@@ -26,9 +40,9 @@ module Uc
     end
 
     def to_s
-      status = ( running? ? "Running pid #{pid}" : "Stopped")
+      status = ( running? ? "Running pid #{pid}" : "Stopped" )
     end
-
+      
     private
 
     def ex_lock_available?
@@ -44,6 +58,20 @@ module Uc
       return -1
     end
 
+    def fuser_pids
+      @fuser_pids ||= begin
+        output = `fuser #{paths.lock_file} 2>/dev/null`
+        pids = output.strip.split.map { |pid| pid.to_i }
+      end
+    end
+
+    def pid_valid?
+      if use_pid
+        return true
+      else
+        fuser_pids.include?(pid_from_file)
+      end
+    end
 
   end
 end

data/lib/uc/templates/unicorn.erb

@@ -35,6 +35,7 @@ before_fork do |server, worker|
 end
 
 after_fork do |server, worker|
+  uc.oom_adjust
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.establish_connection
     
@@ -51,8 +52,6 @@ end
 if respond_to? :on_exec_fail
   uc = uc
   on_exec_fail do |server|
-    puts "runnign asdadad"
     uc.on_exec_fail
-    puts "lol"
   end
 end

data/lib/uc/unicorn/api.rb

@@ -52,6 +52,14 @@ module Uc; module Unicorn
       shared_lock.acquire
     end
 
+    def oom_adjust
+      pid = Process.pid
+      oom_file = "/proc/#{pid}/oom_score_adj"
+      File.open(oom_file,"w") do |f|
+        f.write "100"
+      end
+    end
+
     def shared_env
       @shared_env ||= {}
     end

data/lib/uc/unicorn/init.rb

@@ -34,7 +34,7 @@ module Uc
       end
 
       def acquire_lock
-        lock_acquired = File.new(lock_file, "a+").flock(File::LOCK_SH | File::LOCK_NB )
+        lock_acquired = lock_fd.flock(File::LOCK_SH | File::LOCK_NB )
        rescue => e
         stderr.error "#{e.class} #{e.message}\n #{e.backtrace.join("\n")}"
         return false
@@ -46,6 +46,10 @@ module Uc
        run
       end
 
+      def lock_fd
+        @lock_fd ||= File.new(lock_file, "a+")
+      end
+
       def end_run(worker)
         @worker = worker
         if last_worker?

data/lib/uc/version.rb

@@ -1,3 +1,3 @@
 module Uc
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler