resque-telework 0.3.1 → 0.3.2

data/README.md

@@ -5,6 +5,8 @@ Resque Telework
 
 Telework depends on Resque 1.20+ and Redis 2.2+
 
+A native daemon in Haskell is also available at [github.com/gip/resque-telework-daemon-hs](https://github.com/gip/resque-telework-daemon-hs) to have acceptable resource (CPU/memory) utilization.
+
 Telework 0.3 has a new auto feature that is in beta and currently under testing - please report bugs to [gip.github@gmail.com](gip.github@gmail.com)
 
 Description
@@ -32,6 +34,11 @@ Version 0.3.0
 * Auto mode for workers
 * Updated window layout
 
+Native Daemon
+-------------
+
+The reference daemon is implemented in Ruby. This is however very inefficient since the full Rails environment needs to be loaded, which can take up to 160MB of memory. Running in Ruby without Rails still takes a significant amount of memory. [github.com/gip/resque-telework-daemon-hs](https://github.com/gip/resque-telework-daemon-hs) is a lightweight daemon written in Haskell. It compiles to native code gives largely improved performance both in term of CPU load and memory usage (less than 5MB).
+
 
 Overview of the WebUI
 ---------------------

data/lib/resque-telework/global.rb

@@ -3,7 +3,7 @@ module Resque
     module Telework
       Name = NAME = 'resque-telework'
       Nickname = NICKNAME = 'telework'
-      Version = VERSION = '0.3.1'
+      Version = VERSION = '0.3.2'
       RedisInterfaceVersion = REDIS_INTERFACE_VERSION = '2'
     end
   end

data/lib/resque-telework/server.rb

@@ -135,6 +135,13 @@ module Resque
             my_show 'stopit'
           end
 
+          app.post "/#{appn.downcase}_del_host/:host" do
+            host= params[:host]
+            redis.hosts_rem( host )
+            redis.aliases_rem( host )
+            redirect "/resque/#{appn.downcase}"            
+          end          
+
           app.post "/#{appn.downcase}_mod_host/:host" do
             host= params[:host]
             ahost= params[:alias]
@@ -204,12 +211,12 @@ module Resque
             @qmanual= params[:qmanual]
             @count= params[:c]
             #@rev= params[:r].split(' ')
-            @env= params[:e]
+            @envv= params[:e]
             @q= @qmanual.blank? ? @queue : @qmanual
             id= redis.unique_id.to_s
             t= task_default
             redis.tasks_add( @host , id, t.merge( { 'task_id' => id, 'worker_count' => @count,
-                                                    'rails_env' => @env, 'queue' => @q,
+                                                    'rails_env' => @envv, 'queue' => @q,
                                                     'worker_id' => [], 'worker_status' => 'Stopped'} ) )
             redirect "/resque/#{appn.downcase}"          
           end

data/lib/resque-telework/server/views/host.erb

@@ -9,3 +9,9 @@
 </table>
 <input type="submit" value= "Save" />
 </form>
+<br/>
+<h1>Delete Host <%= @host %></h1>
+This will delete all the entries for the host - use with caution!
+<form style="margin:0px;float:center;" id="delm" name="delm" method="post" action="/resque/telework_del_host/<%= @host %>" >
+<br/><input type="submit" value="Delete" />
+<form>

data/lib/resque-telework/server/views/telework.erb

@@ -169,9 +169,11 @@ $(document).ready(function() {
       	  <a href=<%= "/resque/telework/host/#{host}" %> title="<%= "#{host}\n#{redis.comments(host)}" %>" >
       	  <% if ahost!=host %><%= ahost %><% else %>
       	  <%= host %><% end %></a>
-	      <% if 'Alive'==status && info['cpu_load_1mins'] %>
-	         <br/><%= "(%.2f%% cpu)" % (100*info['cpu_load_1mins']) %></center>
-	      <% end %>
+	      <% if 'Alive'==status && info['cpu_load_1mins'] %><br/><%= "(%.2f%% cpu)" % (100*info['cpu_load_1mins']) %><% end %>
+	      <% if 'Alive'==status && info['load_avg_1mins'] %><br/><%= "(%.2f load)" % (info['load_avg_1mins'].to_f) %><% end %>
+	      <% if 'Alive'==status && info['mem_total'] && info['mem_free'] %>
+	      	       <br/><%= "(%.2f%% mem)" % (100*(1-info['mem_free'].to_f/info['mem_total'].to_f)) %><% end %>
+	     </center>
 	  </td>
       <% if 'Alive'==status %>
         <td> <center><%= "Alive (v#{info['version']})" %><br/><br/>
@@ -278,7 +280,7 @@ $(document).ready(function() {
     <% for info in redis.statuses(@status_messages) %>
     <% c= info['severity']=='Error' ? "bgcolor=\"#ff0000\"" : "" %>
       <tr>
-	    <td <%= c %>><%= info['host'] %></td>
+	    <td <%= c %>><%= redis.aliases(info['host']) %></td>
 	    <td <%= c %>><%= info['severity'] %></td>
 	    <td <%= c %>><%= redis.fmt_date(info['date']) %></td>
 	    <td <%= c %>><%= info['message'] %></td>

data/lib/tasks/telework.rake

@@ -31,6 +31,14 @@ namespace :telework do
         $stderr.reopen(lf)
       end
       Process.setsid      # I'm grown up now
+      
+      # New Redis connection after fork
+      ns = Resque.redis.namespace
+      redis_host = Resque.redis.client.host
+      redis_port = Resque.redis.client.port
+      Resque.redis = Redis.new(:host => redis_host, :port => redis_port)
+      Resque.redis.namespace = ns
+
       daemon.start        # Start the daemon
       File.delete(lpid)   # Delete the pid file
     end

metadata

@@ -1,60 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: resque-telework
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Gilles Pirio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-28 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: resque
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 20
-        - 0
+  requirement: &70292753162640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.20.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sys-cpu
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70292753162640
+- !ruby/object:Gem::Dependency
+  name: sys-cpu
+  requirement: &70292753161680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
-  version_requirements: *id002
-description: "  Telework is a Resque plugin aimed at controlling Resque workers from the web UI. It makes it easy to manage workers on a \n  complex systems that may include several hosts, different queue(s) and an evolving source code that is deployed several times a day. \n  Beyond starting and stopping workers on remote hosts, the plugin makes it easy to switch between code revisions, gives a partial view of \n  each worker's log (stdout and stderr) and maintains a status of each workers.\n"
+  prerelease: false
+  version_requirements: *70292753161680
+description: ! "  Telework is a Resque plugin aimed at controlling Resque workers
+  from the web UI. It makes it easy to manage workers on a \n  complex systems that
+  may include several hosts, different queue(s) and an evolving source code that is
+  deployed several times a day. \n  Beyond starting and stopping workers on remote
+  hosts, the plugin makes it easy to switch between code revisions, gives a partial
+  view of \n  each worker's log (stdout and stderr) and maintains a status of each
+  workers.\n"
 email: gip.github@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - MIT-LICENSE
-files: 
+files:
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -74,35 +66,30 @@ files:
 - lib/resque-telework/server/views/worker.erb
 - lib/tasks/telework.rake
 - resque-telework.gemspec
-has_rdoc: true
 homepage: https://github.com/gip/resque-telework
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: "resque-telework: A Resque plugin aimed at controlling Resque workers from the web UI"
+summary: ! 'resque-telework: A Resque plugin aimed at controlling Resque workers from
+  the web UI'
 test_files: []
-
+has_rdoc: