right_chimp 1.0.7 → 1.0.8

data/README

@@ -1,6 +1,6 @@
 Chimp: a command-line tool for remote command execution using the RightScale platform
 
-The goal of the Chimp is to provide a simple command line utility for 
+The goal of the Chimp is to provide a simple command line utility for
 performing bulk operations on servers managed on the RightScale platform.
 
 EXAMPLE USAGE
@@ -18,7 +18,7 @@ Run a shell command on servers with a specific tag:
 
   chimp --tag="service:myservice=true" --ssh="uptime"
 
-Run a report: 
+Run a report:
 
   bin/chimp --tag="service:myservice=true" --report="nickname,ip-address,tag=myservice:version"
 
@@ -39,13 +39,13 @@ Would include both the server nickname and ip address to the report:
   server1-4.rightscale.com,192.168.0.4
 
 Any field present on a rest_connection Server object can be queried. This
-includes: 
+includes:
 
   Field                               Example
   ----------------------------------- ----------------------------
   aws-id                              i-12345
   aws-platform                        Linux/Unix
-  cloud_id                              
+  cloud_id
   created_at
   current_instance_href
   deployment_href
@@ -77,4 +77,4 @@ Additionally you can report on instance tags:
 
 OBLIGATORY MAINTENANCE STRING
 -----------------------------
-maintained by Red_Team
+Maintained by the RightScale Red_Team

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -434,35 +434,51 @@ module Chimp
     #
     class DisplayServlet < GenericServlet
       def do_GET(req, resp)
-        job_filter = self.get_verb(req) || "running"
+        #
+        # First determine the path to the files to serve
+        #
+        if ENV['CHIMP_TEST'] != 'TRUE'
+          template_path = File.join(Gem.dir, 'gems', 'right_chimp-' + VERSION, 'lib/right_chimp/templates')
+        else
+          template_path = 'lib/right_chimp/templates'
+        end
 
-        if not @template
-          if ENV['CHIMP_TEST'] != 'TRUE'
-            template_file_name = File.join(Gem.dir, 'gems', 'right_chimp-' + VERSION, 'lib/right_chimp/templates/all_jobs.erb')
-          else
-            template_file_name = 'lib/right_chimp/templates/all_jobs.erb'
-          end
+        #
+        # Check for static CSS files and serve them
+        #
+        if req.request_uri.path =~ /\.(css|js)$/
+          filename = req.request_uri.path.split('/').last
+          resp.body = File.read(File.join(template_path, filename))
+          raise WEBrick::HTTPStatus::OK
+        else
 
-          @template = ERB.new(File.read(template_file_name), nil, ">")
-        end
+          #
+          # Otherwise process ERB template
+          #
+          job_filter = self.get_verb(req) || "running"
+
+          if not @template
+            @template = ERB.new(File.read(File.join(template_path, "all_jobs.erb")), nil, ">")
+          end
 
-        queue = ChimpQueue.instance
-        jobs = queue.get_jobs
-        group_name = nil
+          queue = ChimpQueue.instance
+          jobs = queue.get_jobs
+          group_name = nil
 
-        if job_filter == "group"
-          group_name = req.request_uri.path.split('/')[-1]
-          g = ChimpQueue[group_name.to_sym]
-          jobs = g.get_jobs if g
-        end
+          if job_filter == "group"
+            group_name = req.request_uri.path.split('/')[-1]
+            g = ChimpQueue[group_name.to_sym]
+            jobs = g.get_jobs if g
+          end
 
-        count_jobs_running = queue.get_jobs_by_status(:running).size
-        count_jobs_queued  = queue.get_jobs_by_status(:none).size
-        count_jobs_failed  = queue.get_jobs_by_status(:error).size
-        count_jobs_done    = queue.get_jobs_by_status(:done).size
+          count_jobs_running = queue.get_jobs_by_status(:running).size
+          count_jobs_queued  = queue.get_jobs_by_status(:none).size
+          count_jobs_failed  = queue.get_jobs_by_status(:error).size
+          count_jobs_done    = queue.get_jobs_by_status(:done).size
 
-        resp.body = @template.result(binding)
-        raise WEBrick::HTTPStatus::OK
+          resp.body = @template.result(binding)
+          raise WEBrick::HTTPStatus::OK
+        end
       end
     end # DisplayServlet
   end # ChimpDaemon

data/lib/right_chimp/queue/QueueWorker.rb

@@ -5,13 +5,13 @@
 module Chimp
   class QueueWorker
     attr_accessor :delay, :retry_count, :never_exit
-    
+
     def initialize
       @delay = 0
       @retry_count = 0
       @never_exit = true
     end
-    
+
     #
     # Grab work items from the ChimpQueue and process them
     # Only stop is @ever_exit is false
@@ -29,14 +29,21 @@ module Chimp
           else
             sleep 1
           end
-        
-        rescue StandardError => ex
-          $stderr.puts "Exception in QueueWorker.run: #{ex}"
-          puts ex.inspect
-          puts ex.backtrace
+
+        #
+        # the rest_connection gem raises RuntimeErrors so we need to
+        # rescue Exception here
+        #
+        rescue Exception => ex
+          Log.error "Exception in QueueWorker.run: #{ex}"
+          Log.debug ex.inspect
+          Log.debug ex.backtrace
+
+          work_item.status = Executor::STATUS_ERROR
+          work_item.error = ex
         end
       end
     end
-    
+
   end
 end

data/lib/right_chimp/templates/all_jobs.erb

@@ -1,83 +1,22 @@
 <html><head>
 <title>chimpd</title>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta http-equiv="refresh" content="5">
-<style type="text/css">
-  body {
-    color: #088A29;
-    background-color: black;
-    font-family: monospace;
-    font-size: 10px;
-    margin: 0;
+<link rel="stylesheet" href="default.css" title="default" />
+<link rel="alternate stylesheet" href="greenscreen.css" title="greenscreen" />
+<link rel="alternate stylesheet" href="hotdogstand.css" title="hotdogstand" />
+<script src="styleswitcher.js"></script>
+
+<script type="text/javascript">
+
+  function chimpd_job_control(obj, url) {
+    obj.style.color = "red";
+    xmlhttp = new XMLHttpRequest();
+    xmlhttp.open("GET", url, true);
+    xmlhttp.send();
   }
-  
-  h3 {
-    font-weight: bold;
-    border-bottom: 2px solid #088A29;
-  }
-  
-  ol, ul {
-    list-style-type: none;
-  }
-  
-  ol {
-    padding-left: 10px;
-  }
-  
-  ul {
-    padding-bottom: 5px;
-    border-bottom: solid #088A29 2px;
-  }
-  
-  div#stats {
-    background-color: black; /* #002A5C */
-    color: #088A29;
-    float: left;
-    border-right: solid 2px #088A29;
-    position: fixed;
-    height: 100%;
-    padding: 5px;
-    padding-right: 15px;
-  }
-  
-  div#jobs {
-    position: absolute;
-    left: 375px;
-    top: 10px;
-    width: 500px;
-    padding-left: 20px;
-    color: #088A29;
-  }
-  
-  div#groups {
-    color: #088A29;
-    background-color: black;
-  }
-  
-  div#groups a {
-    color: #088A29;
-    background-color: black;
-  }
-  
-  .highlight {
-    background-color: #088A29;
-    color: black;
-  }
-  
-  td {
-    padding-right: 10px;
-  }
-  
-  a {
-    text-decoration: underline;
-    color: #088A29;
-    font-weight: bold;
-  }
-  
-  a:hover, ol a:hover {
-    text-decoration: underline;
-  }
-  
-</style>
+
+</script>
 
 </head><body>
 
@@ -106,12 +45,12 @@ SINCE 2012</p>
 </table>
 
 <h3>Job Groups</h3>
-<div id="groups" width="90%" style="border: solid 1px #088A29; overflow-y: auto; height: 150px; background: black; color: #088A29;">
+<div id="groups" width="90%" >
   <ol style="margin: 0; padding: 3px;">
   <% queue.group.values.each do |g| %>
     <li>
       [<%= sprintf( "%03d", g.get_jobs_by_status(:running).size) %>/<%= sprintf( "%03d", g.get_job_ids.size) %> <%= g.short_name  %>] <% if group_name == g.group_id %><span class="highlight"><%=g.group_id%></span><% else %><a href="/display/group/<%=g.group_id%>"><%= g.group_id %></a><% end %>
-      
+
     </li>
   <% end %>
   </ol>
@@ -120,19 +59,26 @@ SINCE 2012</p>
 
 <h3>Filter Results</h3>
 
-<p>[ 
-<% if job_filter == 'running' or job_filter == nil %>running jobs <% else %><a href="/display/running">running jobs</a><% end %> | 
+<p>[
+<% if job_filter == 'running' or job_filter == nil %>running jobs <% else %><a href="/display/running">running jobs</a><% end %> |
 <% if job_filter == 'all' %>all jobs <% else %><a href="/display/all">all jobs</a> <% end %> |
-<% if job_filter == 'done' %>complete jobs <% else %><a href="/display/done">complete jobs</a><% end %> | 
+<% if job_filter == 'done' %>complete jobs <% else %><a href="/display/done">complete jobs</a><% end %> |
 <% if job_filter == 'error' %>failed jobs <% else %><a href="/display/error">failed jobs</a><% end %>
  ]
 </p>
 
 <h3>Commands</h3>
 <ol>
-  <li><a href="/job/running/cancel">cancel running jobs</a></li>
-  <li><a href="/job/error/retry">retry failed jobs </a></li>
-  <li><a href="/job/all/report">download execution report</a></li>
+  <li><a href="#" onclick="chimpd_job_control(this, '/job/running/cancel')">cancel running jobs</a></li>
+  <li><a href="#" onclick="chimpd_job_control(this, '/job/error/retry')">retry failed jobs </a></li>
+  <li><a href="#" onclick="chimpd_job_control(this, '/job/all/report')">download execution report</a></li>
+</ol>
+
+<h3>Theme</h3>
+<ol>
+  <li> <a href="#" onclick="setActiveStyleSheet('default')">default</a></li>
+  <li> <a href="#" onclick="setActiveStyleSheet('greenscreen')">green screen</a></li>
+  <li> <a href="#" onclick="setActiveStyleSheet('hotdogstand')">hot dog stand</a></li>
 </ol>
 
 </div>
@@ -144,7 +90,7 @@ SINCE 2012</p>
   <h1>Job Group: <%=CGI::escapeHTML(group_name)%></h1>
 <% end %>
 
-<% 
+<%
 #
 # Print out all the jobs
 #
@@ -154,12 +100,12 @@ end
 
 jobs.each do |j|
   next unless j
-  
+
   status      = j.status
   id          = j.job_id
 
   server_name = CGI::escapeHTML(j.server['nickname']) if j.server
-  
+
   if j.exec
     action      = j.exec.to_s
     action      = j.exec['right_script']['name'] if j.exec['right_script']
@@ -170,8 +116,8 @@ jobs.each do |j|
   if job_filter and not (job_filter == 'all' or job_filter == 'group' )
     next unless status == job_filter.to_sym
   end
-  
-  execution_time_seconds = j.get_total_exec_time  
+
+  execution_time_seconds = j.get_total_exec_time
   h = (execution_time_seconds/3600).to_i
   m = (execution_time_seconds/60 - h*60).to_i
   s = (execution_time_seconds - (m*60 + h*3600))
@@ -179,9 +125,9 @@ jobs.each do |j|
 
 %>
 
-<h2 style="float: left; color: #088A29">#<%= id %></h2>
+<h2>#<%= id %></h2>
 <%
-  color = "#088A29" 
+  color = "#088A29"
   color = "brightgreen" if status == Executor::STATUS_RUNNING
   color = "orange"      if status == Executor::STATUS_RETRYING
   color = "red"         if status == Executor::STATUS_ERROR
@@ -195,15 +141,15 @@ jobs.each do |j|
     <% if status != Executor::STATUS_RUNNING %>
       <li>Results: <span style="color:#777"><%= j.results %></span></li>
     <% end %>
-    
+
     <li> <span class="action">
     <% if status == Executor::STATUS_ERROR %>
-      <a href="/job/<%=id%>/ack">ack</a> | 
-      <a href="/job/<%=id%>/retry">retry</a>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/ack')">ack</a> |
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">retry</a>
     <% elsif status == Executor::STATUS_RUNNING %>
-      <a href="/job/<%=id%>/cancel">cancel</a>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/cancel')">cancel</a>
     <% else %>
-      <a href="/job/<%=id%>/retry">requeue</a>
+      <a href="#" onclick="chimpd_job_control(this, '/job/<%=id%>/retry')">requeue</a>
     <% end %>
     </li>
   </ul>

data/lib/right_chimp/templates/default.css

@@ -0,0 +1,81 @@
+body {
+  color: black;
+  background-color: white;
+  font-family: monospace;
+  font-size: 10px;
+  margin: 0;
+}
+
+h3 {
+  font-weight: bold;
+  border-bottom: 2px solid black;
+}
+
+h2 {
+  float: left;
+}
+
+ol, ul {
+  list-style-type: none;
+}
+
+ol {
+  padding-left: 10px;
+}
+
+ul {
+  padding-bottom: 5px;
+  border-bottom: solid black 2px;
+}
+
+div#stats {
+  background-color: white; /* #002A5C */
+  color: black;
+  float: left;
+  border-right: solid 2px black;
+  position: fixed;
+  height: 100%;
+  padding: 5px;
+  padding-right: 15px;
+}
+
+div#jobs {
+  position: absolute;
+  left: 375px;
+  top: 10px;
+  width: 500px;
+  padding-left: 20px;
+  color: black;
+}
+
+div#groups {
+  color: black;
+  background-color: white;
+  border: solid 1px;
+  overflow-y: auto;
+  height: 150px;
+}
+
+div#groups a {
+  color: black;
+  background-color: white;
+}
+
+.highlight {
+  background-color: black;
+  color: white;
+}
+
+td {
+  padding-right: 10px;
+}
+
+a {
+  text-decoration: underline;
+  color: black;
+  font-weight: bold;
+}
+
+a:hover, ol a:hover {
+  text-decoration: underline;
+}

data/lib/right_chimp/templates/greenscreen.css

@@ -0,0 +1,82 @@
+body {
+  color: #088A29;
+  background-color: black;
+  font-family: monospace;
+  font-size: 10px;
+  margin: 0;
+}
+
+h3 {
+  font-weight: bold;
+  border-bottom: 2px solid #088A29;
+}
+
+h2 {
+  float: left;
+  color: #088A29;
+}
+
+ol, ul {
+  list-style-type: none;
+}
+
+ol {
+  padding-left: 10px;
+}
+
+ul {
+  padding-bottom: 5px;
+  border-bottom: solid #088A29 2px;
+}
+
+div#stats {
+  background-color: black; /* #002A5C */
+  color: #088A29;
+  float: left;
+  border-right: solid 2px #088A29;
+  position: fixed;
+  height: 100%;
+  padding: 5px;
+  padding-right: 15px;
+}
+
+div#jobs {
+  position: absolute;
+  left: 375px;
+  top: 10px;
+  width: 500px;
+  padding-left: 20px;
+  color: #088A29;
+}
+
+div#groups {
+  color: #088A29;
+  background-color: black;
+  border: solid 1px #088A29;
+  overflow-y: auto;
+  height: 150px;
+}
+
+div#groups a {
+  color: #088A29;
+  background-color: black;
+}
+
+.highlight {
+  background-color: #088A29;
+  color: black;
+}
+
+td {
+  padding-right: 10px;
+}
+
+a {
+  text-decoration: underline;
+  color: #088A29;
+  font-weight: bold;
+}
+
+a:hover, ol a:hover {
+  text-decoration: underline;
+}

data/lib/right_chimp/templates/hotdogstand.css

@@ -0,0 +1,82 @@
+body {
+  color: yellow;
+  background-color: red;
+  font-family: monospace;
+  font-size: 10px;
+  margin: 0;
+}
+
+h3 {
+  font-weight: bold;
+  border-bottom: 2px solid yellow;
+}
+
+h2 {
+  float: left;
+  color: yellow;
+}
+
+ol, ul {
+  list-style-type: none;
+}
+
+ol {
+  padding-left: 10px;
+}
+
+ul {
+  padding-bottom: 5px;
+  border-bottom: solid yellow 2px;
+}
+
+div#stats {
+  background-color: red; /* #002A5C */
+  color: yellow;
+  float: left;
+  border-right: solid 2px yellow;
+  position: fixed;
+  height: 100%;
+  padding: 5px;
+  padding-right: 15px;
+}
+
+div#jobs {
+  position: absolute;
+  left: 375px;
+  top: 10px;
+  width: 500px;
+  padding-left: 20px;
+  color: yellow;
+}
+
+div#groups {
+  color: yellow;
+  background-color: red;
+  border: solid 1px yellow;
+  overflow-y: auto;
+  height: 150px;
+}
+
+div#groups a {
+  color: yellow;
+  background-color: red;
+}
+
+.highlight {
+  background-color: yellow;
+  color: red;
+}
+
+td {
+  padding-right: 10px;
+}
+
+a {
+  text-decoration: underline;
+  color: yellow;
+  font-weight: bold;
+}
+
+a:hover, ol a:hover {
+  text-decoration: underline;
+}

data/lib/right_chimp/templates/styleswitcher.js

@@ -0,0 +1 @@
+function setActiveStyleSheet(title) {
  var i, a, main;
  for(i=0; (a = document.getElementsByTagName("link")[i]); i++) {
    if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")) {
      a.disabled = true;
      if(a.getAttribute("title") == title) a.disabled = false;
    }
  }
  var i, a;
  for(i=0; (a = document.getElementsByTagName("link")[i]); i++) {
    if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title") && !a.disabled) return a.getAttribute("title");
  }
  return null;
  var i, a;
  for(i=0; (a = document.getElementsByTagName("link")[i]); i++) {
    if(a.getAttribute("rel").indexOf("style") != -1
       && a.getAttribute("rel").indexOf("alt") == -1
       && a.getAttribute("title")
       ) return a.getAttribute("title");
  }
  return null;
  if (days) {
    var date = new Date();
    date.setTime(date.getTime()+(days*24*60*60*1000));
    var expires = "; expires="+date.toGMTString();
  }
  else expires = "";
  document.cookie = name+"="+value+expires+"; path=/";
  var nameEQ = name + "=";
  var ca = document.cookie.split(';');
  for(var i=0;i < ca.length;i++) {
    var c = ca[i];
    while (c.charAt(0)==' ') c = c.substring(1,c.length);
    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
  }
  return null;
  var cookie = readCookie("style");
  var title = cookie ? cookie : getPreferredStyleSheet();
  setActiveStyleSheet(title);
  var title = getActiveStyleSheet();
  createCookie("style", title, 365);

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_connection
@@ -143,6 +143,10 @@ files:
 - lib/right_chimp/queue/ExecutionGroup.rb
 - lib/right_chimp/queue/QueueWorker.rb
 - lib/right_chimp/templates/all_jobs.erb
+- lib/right_chimp/templates/default.css
+- lib/right_chimp/templates/greenscreen.css
+- lib/right_chimp/templates/hotdogstand.css
+- lib/right_chimp/templates/styleswitcher.js
 - lib/right_chimp/version.rb
 - spec/spec_chimp.rb
 - spec/spec_chimp_commandline.rb