sidekiq-runner 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7fa70811b720ebc2ab7a34f674df39ce1f2816
-  data.tar.gz: 61bbd1e7ba1e5b094f0b0b4dd3b9b8f2cef8cde9
+  metadata.gz: bc538d49e4cd0c3dbd72dd4b32d124c427fe60c1
+  data.tar.gz: e9753e622a05176942872caa99ea4397fe3d9ff2
 SHA512:
-  metadata.gz: 1e15d46d709d85d15832e1595a0601ffc77c7cc60b71dda140a5d92fa9d2644252c46f84e04e594f9880799f6680a9c0b68b00ba5455c5370479eaa6de1a6f7d
-  data.tar.gz: 9728647c72592024dba383849ded7f4ed3dc658ceb28cb09b944a7926f9314d0518422441b06a12e7dcb3690b009ec2363b546bb6ec746bf5d5c1edbaa29e211
+  metadata.gz: d511179b7968501b3a169969fcc3c53fc56950e8b1ef18ac9181f55d6a3b1921e78d5bad422f9cb00f465efef103c37fb0ea76e0abeaa4ffe7dff1016a01db8b
+  data.tar.gz: 7203ffee3f9de1de0ff87871bdfd8b0c419b6dfa4b58b92f8fb6da58478a1e58891b34eef1f5b06934a6ca1c4f9f5514945c5dc36d09d45885a975f4cb3e32f4

data/lib/sidekiq-runner/god_configuration.rb

@@ -15,13 +15,14 @@ module SidekiqRunner
     RUNNER_ATTRIBUTES = [:config_file, :daemonize, :port, :syslog, :events]
     RUNNER_ATTRIBUTES.each { |att| attr_accessor att }
 
-    CONFIG_FILE_ATTRIBUTES = [:process_name, :interval, :stop_timeout, :log_file]
+    CONFIG_FILE_ATTRIBUTES = [:process_name, :interval, :stop_timeout, :log_file, :maximum_memory_usage]
     CONFIG_FILE_ATTRIBUTES.each { |att| attr_accessor att }
 
     def initialize
       @process_name = 'sidekiq'
       @interval  = 30
       @stop_timeout = 30
+      @maximum_memory_usage = nil
 
       @log_file   = File.join(Dir.pwd, 'log', 'god.log')
       @config_file  = File.join(Dir.pwd, 'config', 'god.yml')

data/lib/sidekiq-runner/sidekiq.god

@@ -61,6 +61,17 @@ sidekiq_config.each do |name, skiq|
       end
     end
 
+    # Monitor process memory usage.
+    if god_config.maximum_memory_usage
+      w.restart_if do |restart|
+        restart.condition(:memory_usage) do |c|
+          c.above = god_config.maximum_memory_usage.to_i.megabytes
+          c.times = 3
+          c.interval = god_config.interval
+        end
+      end
+    end
+
     w.lifecycle do |on|
       on.condition(:flapping) do |c|
         c.to_state = [:start, :restart] # If this watch is started or restarted...

data/lib/sidekiq-runner/sidekiq_instance.rb

@@ -4,7 +4,7 @@ module SidekiqRunner
     RUNNER_ATTRIBUTES = [:bundle_env, :chdir, :requirefile]
     RUNNER_ATTRIBUTES.each { |att| attr_accessor att }
 
-    CONFIG_FILE_ATTRIBUTES = [:concurrency, :verbose, :pidfile, :logfile, :tag]
+    CONFIG_FILE_ATTRIBUTES = [:concurrency, :verbose, :pidfile, :logfile, :tag, :rbtrace]
     CONFIG_FILE_ATTRIBUTES.each { |att| attr_accessor att }
 
     attr_reader :name, :queues
@@ -23,6 +23,7 @@ module SidekiqRunner
       @concurrency  = 4
       @verbose      = false
       @tag          = name
+      @rbtrace      = false
     end
 
     def add_queue(queue_name, weight = 1)
@@ -57,7 +58,8 @@ module SidekiqRunner
       create_directories!
 
       cmd = []
-      cmd << (bundle_env ? 'bundle exec sidekiq' : 'sidekiq')
+      cmd << 'bundle exec' if bundle_env
+      cmd << (rbtrace ? File.expand_path('../../../script/sidekiq_rbtrace', __FILE__) : 'sidekiq')
       cmd << '-d'
       cmd << "-c #{concurrency}"
       cmd << '-v' if verbose

data/lib/sidekiq-runner/version.rb

@@ -1,3 +1,3 @@
 module SidekiqRunner
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/script/sidekiq_rbtrace

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'rbtrace'
+
+def sidekiq_bin
+  require 'sidekiq/cli'
+
+  begin
+    cli = Sidekiq::CLI.instance
+    cli.parse
+    cli.run
+  rescue => e
+    raise e if $DEBUG
+    STDERR.puts e.message
+    STDERR.puts e.backtrace.join("\n")
+    exit 1
+  end
+end
+
+sidekiq = `which sidekiq` rescue ''
+if sidekiq.empty?
+  # When we can't locate the Sidekiq executable, mimick
+  # its behaviour here.
+  sidekiq_bin
+else
+  begin
+    # Otherwise load the sidekiq executable.
+    load sidekiq.strip
+  rescue
+    sidekiq_bin
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - FlavourSys Technology GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
-  type: :runtime
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: god
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-  type: :runtime
+  name: god
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+  type: :runtime
 description: Provide an easy way to configure, start, and monitor all your Sidekiq
   processes
 email: technology@flavoursys.com
@@ -52,6 +52,7 @@ files:
 - lib/sidekiq-runner/sidekiq_instance.rb
 - lib/sidekiq-runner/tasks.rb
 - lib/sidekiq-runner/version.rb
+- script/sidekiq_rbtrace
 homepage: https://github.com/FlavourSys/sidekiq-runner
 licenses:
 - MIT
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sidekiq configuration and rake tasks