naf 2.1.12 → 2.1.13

data/app/views/naf/historical_jobs/show.html.erb

@@ -137,6 +137,18 @@
               "#", { class: "terminate" }
             %></td>
           </tr>
+        <% elsif !['Terminating'].include?(@logical_job.status) -%>
+          <tr>
+            <td>Enqueue Application</td>
+            <td><% params = { class: "re-enqueue", content: "#{naf.historical_jobs_path}/reenqueue", id: @historical_job.id } %>
+              <% if @historical_job.application_id.present? -%>
+                <% params[:app_id] = @historical_job.application.id %>
+              <% end %>
+              <%= link_to image_tag('control_play_blue.png',
+              class: 'action',
+              title: "Re-enqueue one instance of job #{@historical_job.id}"),
+              "#", params %>
+            </td>
         <% end %>
       </tbody>
     </table>
@@ -163,8 +175,12 @@
       </tbody>
     </table>
     </br>
-    <%= render partial: 'naf/log_viewer/log_layout', locals: { record_id: @historical_job.id, record_type: 'job' } %>
-
+    <%= render partial: 'naf/log_viewer/log_layout', locals: { 
+      record_id: @historical_job.id,
+      record_type: 'job',
+      runner_name: @logical_job.runner,
+      server: @logical_job.started_on_machine.try(:server_name),
+      status: @logical_job.status } %>
   </div>
 <% end %>
 
@@ -177,30 +193,5 @@
                      logs_url: "#{http_protocol}#{@logical_job.runner}#{naf.logs_log_parsers_path}",
                      record_type: 'job' } %>
 
-<% content_for :javascripts do %>
-  <script type='text/javascript'>
-    jQuery(document).ready(function () {
-      jQuery(document).delegate('.terminate', "click", function(){
-        var answer = confirm("You are terminating this job. Are you sure you want to do this?");
-        if (!answer) {
-          return false;
-        }
-        var id = <%= @historical_job.id %>;
-        jQuery.ajax({
-          url: id,
-          type:'POST',
-          dataType:'json',
-          data:{ "historical_job[request_to_terminate]": 1, "historical_job_id": id, "_method": "put" },
-          success:function (data) {
-            if (data.success) {
-              var title = data.title ? data.title : data.command
-              jQuery("<p id='notice'>A Job " + title + " was terminated!</p>").
-              appendTo('#flash_message').slideDown().delay(5000).slideUp();
-              setTimeout('window.location.reload()', 5600);
-            }
-          }
-        });
-      });
-    });
-  </script>
-<% end %>
+<!-- This partial controls terminate and re-enqueue links -->
+<% render partial: 'button_control', locals: { historical_job_id: @historical_job.id } %>

data/app/views/naf/log_viewer/_job_log_download_button.html.erb

@@ -0,0 +1,11 @@
+<% style_text = "vertical-align: bottom;" %>
+<% if status == 'Queued' || server.blank?
+  style_text << " display: none;"
+end %>
+<%= button_tag(style: "#{style_text}") do
+  link_to 'Download',
+    link_path,
+    style: "color: black;"
+  end
+%>
+</button>

data/app/views/naf/log_viewer/_job_logs.html.erb

@@ -48,6 +48,9 @@
             </br>
 
             <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+            <%= render partial: 'job_log_download_button', locals: {  server: @job.started_on_machine.try(:server_name),
+                status: logical_job.status,
+                link_path: "#{http_protocol}#{logical_job.runner}#{naf.download_log_parsers_path}?record_id=#{@job.id}&record_type=job" } %>
             &nbsp;&nbsp;&nbsp;
             <%= link_to 'Back to Job', { controller: 'historical_jobs', action: 'show', id: @job.id } %>
           </div>

data/app/views/naf/log_viewer/_log_display.html.erb

@@ -129,7 +129,7 @@
             jQuery('#stdout').text('')
             jQuery('#stdout').append(logs);
             if(jQuery('#stdout').text() == '') {
-              logs = "No logs were found for this search query!<br>";
+              logs = "<pre style='display: inline; word-wrap: break-word;'>No logs were found for this search query!</pre><br>";
               setAutoScrollOff();
             }
             jQuery("#stdout").scrollTop(jQuery('#stdout')[0].scrollHeight);
@@ -138,7 +138,7 @@
           }
           else{
             if(logs == '' && jQuery('#stdout')[0].children.length == 0) {
-              logs = "&nbsp;&nbsp;<span>No logs were found!<br></span>";
+              logs = "<span><pre style='display: inline; word-wrap: break-word;'>No logs were found!</pre><br></span>";
               setAutoScrollOff();
             }
 
@@ -165,10 +165,10 @@
           }
         },
         error: function(response) {
-          message = '&nbsp;&nbsp;<span>Failed to retrieve ' + '<%= record_type %>' + '(' +
+          message = '<span><pre style="display: inline; word-wrap: break-word;">Failed to retrieve ' + '<%= record_type %>' + '(' +
             '<%= record_id %>' + ') logs from ' + '<%= logs_url %>'.match(/^https?\:\/\/([^\/?#]+)/).pop() + '. Please refer to ' +
             'Naf FAQs on the' + ' wiki'.link('https://github.com/fiksu/naf/wiki/Frequently-Asked-Questions') +
-            ' for further information.<br></span>';
+            ' for further information.</pre><br></span>';
 
           jQuery('#stdout').prepend(message);
         }

data/app/views/naf/log_viewer/_log_layout.html.erb

@@ -47,6 +47,11 @@
     <%= link_to 'Auto Scroll (ON)', '#', id: :auto_scroll %>
     </br></br>
     <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+    <% if record_type == 'job' %>
+    <%= render partial: 'naf/log_viewer/job_log_download_button', locals: { 
+        server: server, status: status,
+        link_path: "#{http_protocol}#{runner_name}#{naf.download_log_parsers_path}?record_id=#{record_id}&record_type=job" } %>
+    <% end %>
     <%= link_to 'Full Screen',
                 { controller: 'log_viewer', action: 'index', record_id: record_id, record_type: record_type },
                 { class: 'full_screen' } %>

data/config/routes.rb

@@ -1,5 +1,8 @@
 Naf::Engine.routes.draw do
   resources :historical_jobs, except: [:edit] do
+    collection do
+      post :reenqueue
+    end
     resources :historical_job_affinity_tabs, except: [:destroy]
   end
 
@@ -31,6 +34,7 @@ Naf::Engine.routes.draw do
   resources :log_parsers, only: [] do
     collection do
       get :logs
+      get :download
     end
   end
   resources :status, only: [:index]

data/lib/naf.rb

@@ -45,6 +45,14 @@ module Naf
       configuration.simple_cluster_authenticator_cookie_expiration_time
     end
 
+    def metric_tags
+      configuration.metric_tags
+    end
+
+    def metric_send_delay
+      configuration.metric_send_delay
+    end
+
     def using_another_database?
       model_class != ActiveRecord::Base
     end

data/lib/naf/configuration.rb

@@ -8,7 +8,9 @@ module Naf
                   :layout,
                   :default_page_options,
                   :api_domain_cookie_name,
-                  :simple_cluster_authenticator_cookie_expiration_time
+                  :simple_cluster_authenticator_cookie_expiration_time,
+                  :metric_tags,
+                  :metric_send_delay
 
     def initialize
       @model_class = "::ActiveRecord::Base"
@@ -19,6 +21,8 @@ module Naf
       @api_controller_class = "Naf::ApiSimpleClusterAuthenticatorApplicationController"
       @simple_cluster_authenticator_cookie_expiration_time = 1.week
       @api_domain_cookie_name = "naf_#{Rails.application.class.parent.name.underscore}"
+      @metric_tags = ["#{Rails.env}"]
+      @metric_send_delay = 120
     end
 
   end

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = '2.1.12'
+  VERSION = '2.1.13'
 end

data/naf.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name        = 'naf'
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2014-05-05'
+  s.date        = '2014-07-08'
   s.summary     = 'Creates infrastructure for a customizable and robust Postgres-backed script scheduling/running'
   s.description = 'A cloud based distributed cron, application framework and operations console. Naf works as a distributed script running ' +
                   'system that provides scheduling, logging, alarming, machine redundancy, and the ability to set constraint during script execution'
@@ -24,8 +24,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails'
   s.add_dependency 'will_paginate'
   s.add_dependency 'facter', '~> 1.7.5'
+  s.add_dependency 'aws-sdk', '>= 1.1.0'
+  s.add_dependency 'yajl-ruby', '>= 1.1.0'
+  s.add_dependency 'dogstatsd-ruby', '>= 1.2.0'
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '~> 2.14.0'
   s.add_development_dependency 'factory_girl_rails', '~> 4.0.0'
   s.add_development_dependency 'awesome_print'
 

data/spec/controllers/naf/log_parsers_controller_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Naf
+
+  describe LogParsersController do
+
+    before do
+      Logical::Naf::LogParser::JobDownloader.any_instance.stub(:logs_for_download).and_return("Test Log String")
+    end
+
+    it "raises no exceptions" do
+      assert_nothing_raised do
+        get :download, {'record_id' => 3}
+      end
+    end
+
+    it "has a successful response" do
+      get :download, {'record_id' => 3}
+      assert_response(:success)
+    end
+
+    it "returns the correct string" do
+      get :download, {'record_id' => 3}
+      expect(response.body).to eql("Test Log String\n")
+    end
+
+    it "has the right disposition of attachment" do
+      get :download, {'record_id' => 3}
+      disposition = response.header["Content-Disposition"]
+      expect(disposition.include?("attachment")).to be_true
+    end
+
+  end
+
+end

data/spec/models/logical/naf/application_schedule_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+module Logical
+  module Naf
+
+    describe ApplicationSchedule do
+
+      describe '#exact_time_of_day' do
+
+        #----------------
+        # *** Methods ***
+        #++++++++++++++++
+
+        def update_schedule(run_interval)
+          schedule.run_interval = run_interval
+          schedule.save
+
+          ::Logical::Naf::ApplicationSchedule.new(schedule)
+        end
+
+        #------------------------
+        # *** Shared Examples ***
+        #++++++++++++++++++++++++
+
+        shared_examples 'displays the hour correctly' do |run_interval, time|
+          it { update_schedule(run_interval).exact_time_of_day.should == time }
+        end
+
+        let!(:schedule) { FactoryGirl.create(:schedule_base) }
+
+        it_should_behave_like 'displays the hour correctly', 10, '12:10 AM'
+        it_should_behave_like 'displays the hour correctly', 480, '08:00 AM'
+        it_should_behave_like 'displays the hour correctly', 2880, '12:00 AM'
+        it_should_behave_like 'displays the hour correctly', 20160, '12:00 AM'
+        it_should_behave_like 'displays the hour correctly', 46080, '12:00 AM'
+
+      end
+    end
+
+  end
+end

data/spec/models/logical/naf/construction_zone/boss_spec.rb

@@ -32,6 +32,11 @@ module Logical::Naf::ConstructionZone
       end
     end
 
+    before do
+      ::Naf::HistoricalJob.delete_all
+      ::Naf::ApplicationType.all
+    end
+
     describe '#enqueue_application' do
       let(:application) { FactoryGirl.create(:application) }
       let(:prereq) { FactoryGirl.create(:job) }

data/spec/models/logical/naf/construction_zone/foreman_spec.rb

@@ -44,13 +44,16 @@ module Logical::Naf::ConstructionZone
       describe 'run group restriction is set to limited per machine' do
         let!(:machine) { FactoryGirl.create(:machine) }
         let(:historical_job) { FactoryGirl.create(:job, application_run_group_name: 'test') }
-        let(:tab) { FactoryGirl.create(:machine_job_affinity_tab, historical_job_id: historical_job.id) }
+        let!(:tab) { FactoryGirl.create(:machine_job_affinity_tab, historical_job_id: historical_job.id) }
 
         before do
-          FactoryGirl.create(:queued_job, application_run_group_name: 'test', id: historical_job.id)
+          FactoryGirl.create(:queued_job, application_run_group_name: 'test',
+                                          id: historical_job.id,
+                                          historical_job: historical_job)
           FactoryGirl.create(:running_job_base, application_run_group_name: 'test',
                                                 started_on_machine_id: machine.id,
-                                                application_run_group_name: 'test')
+                                                historical_job: historical_job,
+                                                id: historical_job.id)
         end
 
         it 'return false when application does not have affinity associated with machine' do

data/spec/models/logical/naf/job_downloader_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+module Logical
+  module Naf
+    module LogParser
+      describe JobDownloader do
+        # Create a test file, making sure to not overwrite a current file.
+
+        let!(:test_record_id) { 3 }
+        let!(:test_file_path) { "#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/jobs/#{test_record_id}" }
+        let!(:test_file_name) { "1_20140613_161535.json" }
+        let!(:test_file_text) { "{\n" +
+                                "  \"line_number\": 1,\n" +
+                                "  \"output_time\": \"2014-06-13 16:15:35.689\",\n" +
+                                "  \"message\": \"140613 12:15:35.689 pid=6020 jid=3 Process::Naf::LogArchiver INFO Starting to save files to s3...\"\n" +
+                                "}" }
+        let!(:test_file_output) { "1 2014-06-13 16:15:35.689: 140613 12:15:35.689 pid=6020 jid=3 Process::Naf::LogArchiver INFO Starting to save files to s3...\n" }
+        let!(:segments_to_reset) { {} }
+        let!(:file_preserved) { false }
+
+        before() do
+          # Create a file/directory for example log. If directory exists, move it and save it
+          segments_to_reset = {}
+          total_path = ""
+          file_preserved = false
+
+          test_file_path.split("/").each do |segment|
+            unless segment == ""
+              segments_to_reset[segment] = false
+              unless File.exists?(total_path + segment + "/")
+                Dir.mkdir(total_path + segment + "/")
+                segments_to_reset[segment] = true
+              end
+              total_path += segment + "/"
+            end
+          end
+
+          if File.exists?("#{test_file_path}/#{test_file_name}")
+            FileUtils.mv("#{test_file_path}/#{test_file_name}", "#{test_file_path}/#{test_file_name}-preserving")
+            file_preserved = true
+          end
+
+          File.open("#{test_file_path}/#{test_file_name}", 'w') { |file| file.write(test_file_text) }
+        end
+
+        after() do
+          # Delete the example log file. If a directory was saved before, move it back
+          File.delete("#{test_file_path}/#{test_file_name}")
+
+          if file_preserved
+            FileUtils.mv("#{test_file_path}/#{test_file_name}-preserving", "#{test_file_path}/#{test_file_name}")
+          end
+
+          current_path = test_file_path
+          test_file_path.split("/").reverse_each do |segment|
+            if segments_to_reset[segment]
+              Dir.rmdir(current_path)
+              current_path = current_path[0..-(segment.size + 2)]
+            end
+          end
+
+        end
+
+        it "returns the correct log" do
+          job_log_downloader = JobDownloader.new({ 'record_id' => test_record_id })
+          job_log_downloader.logs_for_download.should eql(test_file_output)
+        end
+
+      end
+    end
+  end
+end

data/spec/models/logical/naf/job_statuses/errored_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Logical
+  module Naf
+    module JobStatuses
+
+      describe Errored do
+
+        context "no conditions" do
+          
+          let!(:conditions) { "" }
+
+          it "returns executable query" do
+            expect { ActiveRecord::Base.connection.execute(Errored.all(conditions)) }.to_not raise_error
+          end
+
+        end
+
+        context "with conditions" do
+
+          let!(:conditions) { "TEST STRING" }
+
+          it "adds conditions to returned sql string" do
+            expect(Errored.all(conditions).include?(conditions)).to be_true
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

data/spec/models/logical/naf/job_statuses/finished_less_minute_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Logical
+  module Naf
+    module JobStatuses
+
+      describe FinishedLessMinute do
+
+        context "no conditions" do
+          
+          let!(:conditions) { "" }
+
+          it "returns executable query" do
+            expect { ActiveRecord::Base.connection.execute(FinishedLessMinute.all(conditions)) }.to_not raise_error
+          end
+
+        end
+
+        context "with conditions" do
+
+          let!(:conditions) { "TEST STRING" }
+
+          it "adds conditions to returned sql string" do
+            expect(FinishedLessMinute.all(conditions).include?(conditions)).to be_true
+          end
+
+        end
+
+      end
+
+    end
+  end
+end