magistrate_monitor 0.2.0 → 0.2.2

data/lib/server.rb

@@ -66,7 +66,7 @@ module MagistrateMonitor
       ActiveSupport::JSON.encode( {:status => 'Ok'} )
     end
 
-    post '/set/:supervisor_name/:worker_name/:action' do
+    post '/supervisors/:supervisor_name/workers/:worker_name/set_target_state/:action' do
       @supervisor = Supervisor.find_or_create_by_name params[:supervisor_name]
       
       @supervisor.set_target_state!(params[:action], params[:worker_name])
@@ -79,8 +79,8 @@ module MagistrateMonitor
       #   "#{root}/#{path}"
       # end
       
-      def url_for_worker(supervisor, name, action)
-        url("/set/#{supervisor.name}/#{name}/#{action}")
+      def target_state_url_for_worker(supervisor, name, action)
+        url("/supervisors/#{supervisor.name}/workers/#{name}/set_target_state/#{action}")
       end
 
       def normalize_status_data!

data/lib/sinatra-activerecord.rb

@@ -19,11 +19,13 @@ module Sinatra
     end
 
     def database
-      @database ||= (
+      @database ||= if defined?(Rails)
+        ActiveRecord::Base
+      else
         #ActiveRecord::Base.logger ||= activerecord_logger # Having this enabled overrides Rails TODO: Find a way to make it not override Rails
         ActiveRecord::Base.establish_connection(database_options)
         ActiveRecord::Base
-      )
+      end
     end
 
   protected
@@ -35,16 +37,11 @@ module Sinatra
       app.helpers ActiveRecordHelper
       
       app.configure do
-        if defined?(Rails)
-          env = Rails.env
-        else
-          
+        unless defined?(Rails)
           env = ENV['RACK_ENV'] || 'development'
+          file = File.join('config', 'database.yml')
+          app.database = YAML::load(ERB.new(IO.read(file)).result).with_indifferent_access[env]
         end
-        
-        file = File.join('config', 'database.yml')
-
-        app.database = YAML::load(ERB.new(IO.read(file)).result).with_indifferent_access[env]
       end
     end
   end

data/lib/supervisor.rb

@@ -22,11 +22,24 @@ module MagistrateMonitor
       self.databag['workers'] ||= {}
     end
     
-    def set_target_state!(action, worker)
+    def normalize_databag_for!(worker)
       d = self.databag || {}
       d['workers'] ||= {}
-      d['workers'][worker] = {'target_state' => action }
-      self.update_attribute :databag, d
+      d['workers'][worker] ||= {}
+      self.databag = d
+    end
+    
+    # This method abstracts access to a worker's databag.  It guarantees to return a hash of some sort useful for referencing worker properties
+    # However, changes to this hash may not be propegated back.
+    # Quite possibly it would be better to do checking here like in set_target_state! to normalize the data?
+    def databag_for(worker)
+      (self.databag['workers'].is_a?(Hash) ? self.databag['workers'][worker] : {}) || {}
+    end
+    
+    def set_target_state!(action, worker)
+      normalize_databag_for!(worker)
+      self.databag['workers'][worker]['target_state'] = action
+      self.update_attribute :databag, self.databag
     end
   end
 end

data/lib/views/index.erb

@@ -9,7 +9,7 @@
       <th>State</th>
       <th>Supervisor Target State</th>
       <th>Monitor Target State</th>
-      <th colspan="3">Actions</th>
+      <th colspan="4">Actions</th>
     </tr>
   </thead>
   
@@ -17,30 +17,37 @@
     <tr>
       <th><a href="<%= url "/supervisors/#{supervisor.name}" %>"><%= supervisor.name %></a><br>
           <%= supervisor.last_checkin_at %></th>
-      <th colspan="7"> - </th>
+      <th colspan="8"> - </th>
       <td><a href="<%= url "/supervisors/#{supervisor.name}/delete" %>" data-confirm="Are you sure?" data-method="post" rel="nofollow">Delete</a><br>
     </tr>
     <% supervisor.status['workers'].each do |k,v| %>
+      <% databag = supervisor.databag_for(k) %>
+      <% current_target_state = databag['target_state'] %>
       <tr>
         <th> - </th>
         <th><%= k %></th>
         <td><%= v['pid'] %></td>
         <td><%= v['state'] %></td>
         <td><%= v['target_state']%></td>
-        <td><%= supervisor.databag['workers'][k]['target_state'] if supervisor.databag['workers'].is_a?(Hash) && supervisor.databag['workers'][k].is_a?(Hash) %></td>
+        <td><%= current_target_state %></td>
         <td>
-          <% if v['state'] != 'running' %>
-            <a href="<%= url_for_worker(supervisor, k, 'running') %>" data-method="post" rel="nofollow">Run</a>
+          <% if current_target_state != 'running' %>
+            <a href="<%= target_state_url_for_worker(supervisor, k, 'running') %>" data-method="post" rel="nofollow">Run</a>
           <% end %>
         </td>
         <td>
-          <% if v['state'] != 'stopped' %>
-            <a href="<%= url_for_worker(supervisor, k, 'stopped') %>" data-method="post" rel="nofollow">Stop</a>
+          <% if current_target_state != 'stopped' %>
+            <a href="<%= target_state_url_for_worker(supervisor, k, 'stopped') %>" data-method="post" rel="nofollow">Stop</a>
           <% end %>
         </td>
         <td>
-          <% if v['state'] != 'unmonitored' %>
-            <a href="<%= url_for_worker(supervisor, k, 'unmonitored') %>" data-method="post" rel="nofollow">Unmonitor</a>
+          <% if current_target_state != 'forced_restart' %>
+            <a href="<%= target_state_url_for_worker(supervisor, k, 'forced_restart') %>" data-method="post" rel="nofollow">Restart</a>
+          <% end %>
+        </td>
+        <td>
+          <% if current_target_state != 'unmonitored' %>
+            <a href="<%= target_state_url_for_worker(supervisor, k, 'unmonitored') %>" data-method="post" rel="nofollow">Unmonitor</a>
           <% end %>
         </td>
       </tr>

data/spec/server_spec.rb

@@ -28,6 +28,30 @@ describe "MagistrateMonitor::Server" do
     last_response.status.should == 302
   end
   
+  it 'should set the target state to running' do
+    @supervisor.set_target_state!('stopped', 'worker1')
+    @supervisor.databag['workers']['worker1']['target_state'].should == 'stopped'
+    
+    post '/supervisors/foo/workers/worker1/set_target_state/running'
+    
+    last_response.status.should == 302
+    
+    @supervisor.reload
+    @supervisor.databag['workers']['worker1']['target_state'].should == 'running'
+  end
+  
+  ['stopped', 'restart', 'unmonitored'].each do |action|
+    it "should set the target state to #{action}" do
+      @supervisor.databag['workers']['worker1']['target_state'].should_not == action
+      post "/supervisors/foo/workers/worker1/set_target_state/#{action}"
+    
+      last_response.status.should == 302
+    
+      @supervisor.reload
+      @supervisor.databag['workers']['worker1']['target_state'].should == action
+    end
+  end
+  
   context 'api' do
     it 'should provide the databag' do
       get '/api/status/foo'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: magistrate_monitor
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Drew Blas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 -05:00
+date: 2011-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency