mobilize-base 1.0.4 → 1.0.5

data/lib/mobilize-base.rb

@@ -70,7 +70,7 @@ if File.exists?(mongoid_config_path)
 end
 require 'google_drive'
 require 'resque'
-require "mobilize-base/extensions/resque"
+require "mobilize-base/handlers/resque"
 #specify appropriate redis port per resque.yml
 Resque.redis = "127.0.0.1:#{Mobilize::Resque.config['redis_port']}"
 require 'popen4'

data/lib/mobilize-base/{extensions → handlers}/resque.rb

@@ -24,6 +24,8 @@ module Mobilize
       return working_workers if state == 'working'
       idle_workers = workers.select{|w| w.job['queue'].nil?}
       return idle_workers if state == 'idle'
+      stale_workers = workers.select{|w| Time.parse(w.started) < Jobtracker.deployed_at}
+      return stale_workers if state == 'stale'
       timeout_workers = workers.select{|w| w.job['payload'] and w.job['payload']['class']!='Jobtracker' and w.job['runat'] < (Time.now.utc - Jobtracker.max_run_time)}
       return timeout_workers if state == 'timeout'
     end
@@ -139,6 +141,18 @@ module Mobilize
       return true
     end
 
+    def Resque.kill_idle_stale_workers
+      idle_pids = Resque.workers('idle').select{|w| w.job=={}}.map{|w| w.to_s.split(":").second}
+      stale_pids = Resque.workers('stale').select{|w| w.job=={}}.map{|w| w.to_s.split(":").second}
+      idle_stale_pids = (idle_pids & stale_pids)
+      if idle_stale_pids.length == 0
+        return false
+      else
+        "kill #{idle_stale_pids.join(" ")}".bash
+      end
+      return true
+    end
+
     def Resque.kill_workers(count=nil)
       pids = Resque.workers.map{|w| w.to_s.split(":").second}
       if count.to_i > pids.length or count == 0

data/lib/mobilize-base/jobtracker.rb

@@ -200,6 +200,19 @@ module Mobilize
       return true
     end
 
+    def Jobtracker.deployed_at
+      #assumes deploy is as of last commit, or as of last deploy time
+      #as given by the least recently updated file in the root folder
+      deploy_time = begin
+                     %{git log -1 --format="%cd"}.bash
+                   rescue
+                     ls_string = "ls -l #{ENV['PWD']}/*".bash
+                     ls_rows = ls_string.split("\n").map{|lss| lss.strip.split(" ")}
+                     mod_times = ls_rows.select{|lsr| lsr.length == 8}.map{|lsr| lsr[5..6].join(" ")}
+                     mod_times.min
+                   end
+      Time.parse(deploy_time)
+    end
 
     #test methods
     def Jobtracker.restart_test_redis

data/lib/mobilize-base/models/user.rb

@@ -30,16 +30,7 @@ module Mobilize
     def runner_path
       u = self
       prefix = "Runner_"
-      suffix = ""
-      if Base.env == 'development'
-        suffix = "(dev)"
-      elsif Base.env == 'test'
-        suffix = "(test)"
-      elsif Base.env == 'production'
-        suffix = ""
-      else
-        raise "Invalid environment"
-      end
+      suffix = (Base.env == 'production' ? "" : "(#{Base.env})")
       title = [prefix,u.name,suffix,"/jobs"].join
       return title
     end

data/lib/mobilize-base/rakes.rb

@@ -2,11 +2,10 @@
 # will give you the resque tasks
 
 namespace :mobilize do
+  require 'mobilize-base'
   desc "Start a Resque worker"
   task :work do
-    require 'resque'
     begin
-      require 'mobilize-base'
       #require specified mobilize gems
       Mobilize::Base.config('jobtracker')['extensions'].each do |e|
         require e
@@ -24,6 +23,14 @@ namespace :mobilize do
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
+  desc "Kill idle workers not in sync with repo"
+  task :kill_idle_stale_workers do
+    Mobilize::Jobtracker.kill_idle_stale_workers
+  end
+  desc "Make sure workers are prepped"
+  task :prep_workers do
+    Mobilize::Jobtracker.prep_workers
+  end
 end
 namespace :mobilize_base do
   desc "Set up config and log folders and files"

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -211,7 +211,6 @@ files:
 - lib/mobilize-base/extensions/google_drive/worksheet.rb
 - lib/mobilize-base/extensions/hash.rb
 - lib/mobilize-base/extensions/object.rb
-- lib/mobilize-base/extensions/resque.rb
 - lib/mobilize-base/extensions/string.rb
 - lib/mobilize-base/handlers/email.rb
 - lib/mobilize-base/handlers/gbook.rb
@@ -219,6 +218,7 @@ files:
 - lib/mobilize-base/handlers/gfile.rb
 - lib/mobilize-base/handlers/gridfs.rb
 - lib/mobilize-base/handlers/gsheet.rb
+- lib/mobilize-base/handlers/resque.rb
 - lib/mobilize-base/jobtracker.rb
 - lib/mobilize-base/models/dataset.rb
 - lib/mobilize-base/models/job.rb
@@ -252,12 +252,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 64363452051803879
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 64363452051803879
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24
@@ -271,4 +277,3 @@ test_files:
 - test/mobilize-base_test.rb
 - test/redis-test.conf
 - test/test_helper.rb
-has_rdoc: