resque-telework 0.3.0 → 0.3.1

data/README.md

@@ -22,6 +22,17 @@ Note that currently (Telework 0.3), the daemon process is included in the main a
 
 Telework has been successfully used in production at Entelo for more that a year with up to 10 servers.
 
+Gems
+----
+
+Version 0.3.1
+* Host aliases and comments (aliases come handy when hostnames cannot be chosen or changing them is too cumbersome - AWS comes to mind)
+
+Version 0.3.0
+* Auto mode for workers
+* Updated window layout
+
+
 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.0'
+      Version = VERSION = '0.3.1'
       RedisInterfaceVersion = REDIS_INTERFACE_VERSION = '2'
     end
   end

data/lib/resque-telework/redis.rb

@@ -22,6 +22,14 @@ module Resque
       def hosts_key # Set
         "#{key_prefix}:hosts"
       end
+
+      def aliases_key # Hash
+        "#{key_prefix}:aliases"        
+      end
+
+      def comments_key # Hash
+        "#{key_prefix}:comments"
+      end
       
       def revisions_key( h ) # List
         "#{key_prefix}:host:#{h}:revisions"
@@ -98,7 +106,7 @@ module Resque
         Resque.redis.set(last_seen_key( @HOST ), t)        
       end
       
-      def register_revision( h, rev, lim=9 )
+      def register_revision( h, rev, lim=10 )
         k= revisions_key(h)
         Resque.redis.ltrim(k, 0, lim-1)
         rem= []
@@ -127,7 +135,23 @@ module Resque
       def hosts_add( h )
         Resque.redis.sadd(hosts_key, h)
       end
-      
+
+      def aliases_add( h, a )
+        Resque.redis.hset( aliases_key, h, a ) unless Resque.redis.hvals( aliases_key ).include?( a )
+      end
+
+      def comments_add( h, a )
+        Resque.redis.hset( comments_key, h, a )
+      end
+
+      def aliases_rem( h )
+        Resque.redis.hdel( aliases_key, h )
+      end 
+
+      def comments_rem( h )
+        Resque.redis.hdel( comments_key, h )
+      end 
+
       def revisions_add( h, v )
         hosts_add(h)
         k= revisions_key(h)
@@ -336,6 +360,15 @@ module Resque
         Resque.redis.smembers(hosts_key)
       end
 
+      def aliases( h )
+        a= Resque.redis.hget( aliases_key, h )
+        a.blank? ? h : a
+      end
+
+      def comments( h )
+        Resque.redis.hget( comments_key, h )
+      end
+
       def revisions( h, lim=30 )
         k= revisions_key(h)
         Resque.redis.ltrim(k, 0, lim-1)

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

@@ -0,0 +1,11 @@
+<h1>Host <%= @host %></h1>
+
+<form style="margin:0px;float:center;" id="hostm" name="hostm" method="post" action="/resque/telework_mod_host/<%= @host %>" >
+<table>
+	<tr><th>Parameter</th><th>Value</th><th>Description</th>
+	<tr><td>Hostname</td><td><%= @host %></td><td></td></tr>
+    <tr><td>Alias</td><td><% a= redis.aliases(@host) %><input id="alias" name="alias" size=60 type="text" value="<%= a==@host || a.blank? ? "" : "#{a}" %>" /></td><td>Alias used in telework</td></tr>
+    <tr><td>Comment</td><td><input id="comment" name="comment" size=60 type="text" value="<%= redis.comments(@host) %>" /></td><td>User-defined comment</td></tr>    
+</table>
+<input type="submit" value= "Save" />
+</form>

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

@@ -103,6 +103,8 @@ $(document).ready(function() {
 <br>
 <% end %>
 
+<% hosts= redis.hosts %>
+
 <% if @scheduling %>
 
 <h1>Starting Workers</h1>
@@ -112,7 +114,7 @@ $(document).ready(function() {
   <div class="control_panel sub_header">
     <form id="startform" name="startform" method="post" action="/resque/telework/start_task" >
       <span class="host_filter">
-        Host: <%= generic_filter("host_filter", "h", redis.hosts, 
+        Host: <%= generic_filter_with_dis("host_filter", "h", hosts.zip( hosts.map{ |h| redis.aliases(h) } ), 
                                  "onchange=\"javascript: hostlist(this.options[this.selectedIndex].value);\"") %>
       </span>
       <span class="queue_filter">
@@ -151,7 +153,7 @@ $(document).ready(function() {
 <h1>Hosts, Revisions, Tasks and Workers</h1>
 <form id="stopping_all" name="stopping_all" method="post" action="/resque/telework/stop_all">
 	<%= generic_filter("mode_filter", "m", ["Stop", "Kill"]) %>
-	 all workers on host <%= generic_filter("host_filter", "h", redis.hosts <<  "[All hosts]") %>
+	 all workers on host <%= generic_filter_with_dis("host_filter", "h", hosts.zip( hosts.map{ |h| redis.aliases(h) } ) <<  ["[All hosts]", "[All hosts]"]) %>
 	<span class="stopping_all_submit"><input type="submit" value="Go"/></span>
 </form></br>
 <table>
@@ -163,9 +165,12 @@ $(document).ready(function() {
     </tr>
     <% for host, status, info in redis.daemons_state %>
       <tr>
-      <td><center><%= host%>
+      <td><center><% ahost = redis.aliases(host) %>
+      	  <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>
+	         <br/><%= "(%.2f%% cpu)" % (100*info['cpu_load_1mins']) %></center>
 	      <% end %>
 	  </td>
       <% if 'Alive'==status %>
@@ -256,7 +261,7 @@ $(document).ready(function() {
 </br>
 <form id="stopping_all" name="stopping_all" method="post" action="/resque/telework/stop_all">
 	<%= generic_filter("mode_filter", "m", ["Stop", "Kill"]) %>
-	 all workers on host <%= generic_filter("host_filter", "h", redis.hosts <<  "[All hosts]") %>
+    all workers on host <%= generic_filter_with_dis("host_filter", "h", hosts.zip( hosts.map{ |h| redis.aliases(h) } ) <<  ["[All hosts]", "[All hosts]"]) %>	 
 	<span class="stopping_all_submit"><input type="submit" value="Go"/></span>
 </form></br></br>
 

data/lib/resque-telework/server.rb

@@ -30,7 +30,6 @@ module Resque
             end
             def generic_filter(id, name, list, more= "")
               html = "<select id=\"#{id}\" name=\"#{name}\" #{more}>"
-              #html += "<option value=\"\">-</option>"
               value= list[0]
               list.each do |k|
                 selected = k == value ? 'selected="selected"' : ''
@@ -38,6 +37,15 @@ module Resque
               end
               html += "</select>"
             end
+            def generic_filter_with_dis(id, name, list, more= "")
+              html = "<select id=\"#{id}\" name=\"#{name}\" #{more}>"
+              value= list[0][0]
+              list.each do |k,dis|
+                selected = k == value ? 'selected="selected"' : ''
+                html += "<option #{selected} value=\"#{k}\">#{dis}</option>"
+              end
+              html += "</select>"
+            end
             def task_default
               { 'auto_max_waiting_job_per_worker' => 1,'auto_worker_min' => 0, 'auto_delay' => 15,
                 'log_snapshot_period' => 30, 'log_snapshot_lines' => 40, 'exec' => "bundle exec rake resque:work --trace"
@@ -86,6 +94,11 @@ module Resque
             @host= params[:host]
             my_show 'task' 
           end
+
+          app.get "/#{appn.downcase}/host/:host" do
+            @host= params[:host]
+            my_show 'host' 
+          end
           
           app.get "/#{appn.downcase}/config" do
             content_type :json
@@ -122,6 +135,23 @@ module Resque
             my_show 'stopit'
           end
 
+          app.post "/#{appn.downcase}_mod_host/:host" do
+            host= params[:host]
+            ahost= params[:alias]
+            comment= params[:comment]
+            if ahost.blank? || ahost==host
+              redis.aliases_rem( host )
+            else
+              redis.aliases_add( host, ahost )
+            end
+            if comment.blank?
+              redis.comments_rem( host )
+            else
+              redis.comments_add( host, comment )
+            end
+            redirect "/resque/#{appn.downcase}"            
+          end
+
           app.post "/#{appn.downcase}_mod_task/:task" do
             @task_id= params[:task]
             @host= nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gilles Pirio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-22 00:00:00 -08:00
+date: 2013-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - lib/resque-telework/railtie.rb
 - lib/resque-telework/redis.rb
 - lib/resque-telework/server.rb
+- lib/resque-telework/server/views/host.erb
 - lib/resque-telework/server/views/misc.erb
 - lib/resque-telework/server/views/revision.erb
 - lib/resque-telework/server/views/stopit.erb