naf 1.1.4 → 2.0.0

data/app/models/process/naf/runner_log.rb

@@ -0,0 +1,26 @@
+require 'open4'
+
+module Process::Naf
+  class RunnerLog < ::Af::Application
+
+    opt :invocation_uuid,
+        "unique identifer used for runner logs",
+        default: `uuidgen`
+
+    def work
+      log_file = ::Logical::Naf::LogFile.new("#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/runners/#{@invocation_uuid}/")
+      log_file.open
+
+      while $stdin.gets
+        begin
+          log_file << $_.rstrip
+        ensure
+          log_file.write
+        end
+      end
+
+      log_file.close
+    end
+
+  end
+end

data/app/views/naf/application_schedule_affinity_tabs/_form.html.erb

@@ -10,11 +10,7 @@
 
   <div class="field">
     <%= f.label :affinity_id, "Affinity*" %></br>
-    <%= f.select(:affinity_id,
-                 ::Naf::Affinity.selectable.map{
-                    |a| [a.affinity_classification.affinity_classification_name + ', ' + a.affinity_name, a.id]
-                 },
-                 include_blank: true) %>
+    <%= f.select(:affinity_id, ::Naf::Affinity.names_list, include_blank: true) %>
   </div>
   </br>
 

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

@@ -136,7 +136,7 @@
             <td><%= link_to "Application Schedule Affinity Tabs",
                     application_application_schedule_application_schedule_affinity_tabs_path(@application, @application.application_schedule) %>
             </td>
-            <td><%= @application.application_schedule.affinities.map(&:affinity_name).join(', ') %></td>
+            <td><%= @logical_application.affinities %></td>
           </tr>
         <% end %>
         <tr>

data/app/views/naf/historical_job_affinity_tabs/_form.html.erb

@@ -16,11 +16,7 @@
 
   <div class="field">
     <%= f.label :affinity %><br />
-    <%= f.select(:affinity_id,
-                 ::Naf::Affinity.selectable.map{
-                    |a| [a.affinity_classification.affinity_classification_name + ', ' + a.affinity_name, a.id]
-                 },
-                 include_blank: true) %>
+    <%= f.select(:affinity_id, ::Naf::Affinity.names_list, include_blank: true) %>
   </div>
   </br>
 

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

@@ -4,7 +4,7 @@
     <h2><%= pluralize(@historical_job.errors.count, "error") %> prohibited this application from being saved:</h2>
 
     <ul>
-      <% @historical_job.errors.full_messages.each do |msg| %> 
+      <% @historical_job.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>
       <% end %>
     </ul>

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

@@ -5,18 +5,27 @@
         <h3 id="record_name">Runners: </h3>
       </div>
     </td>
-    <td>
-      <div class="running"><%= ::Naf::MachineRunner.running.uniq.count %> running&nbsp;</div>
+    <td width='5%'>
+      <div class="running-count"><%= ::Naf::MachineRunner.running.uniq.count %> running</div>
+    </td>
+    <td width='7%'>
+      <div class="winding-down-count"><%= ::Naf::MachineRunner.winding_down.uniq.count %> winding down</div>
+    </td>
+    <td width='5%'>
+      <div class="down-count"><%= ::Naf::MachineRunner.dead_count %> down</div>
+    </td>
+    <td width='15%'>
+      <div id='page-label'>
+        <h3 id='record_name'>Schedules last checked at: </h3>
+      </div>
+    </td>
+    <td width='15%'>
+      <div class='last_checked_schedule_at'><%= time_format(::Naf::Machine.last_time_schedules_were_checked) %></div>
+    </td>
+    <td width='65%'>
+      <div id='create_links' style='position: relative; float:right;'>
+        <span id='create'><%= naf_generate_create_link %></span>
+      </div>
     </td>
-    <% if ::Naf::MachineRunner.winding_down.count > 0 -%>
-      <td>
-        <div class="winding-down"><%= ::Naf::MachineRunner.winding_down.uniq.count %> winding down&nbsp;&nbsp;</div>
-      </td>
-    <% end %>
-    <% if ::Naf::MachineRunner.dead.count > 0 -%>
-      <td>
-        <div class="down"><%= ::Naf::MachineRunner.dead.count %> down</div>
-      </td>
-    <% end %>
  </tr>
 </table>

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

@@ -1,4 +1,3 @@
-<br/>
 <div class="display-inline-block search_select_input">
   <%= label(:status, "Status:") %>
   <%= select_tag("search[status]",
@@ -8,7 +7,7 @@
                                       ["Waiting", :waiting],
                                       ["Finished", :finished],
                                       ["Errored", :errored]], @search_status),
-                  { class: 'datatable_variable' }) %></b>
+                  { class: 'datatable_variable' }) %>
 </div>
 &nbsp;&nbsp;
 

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

@@ -1,6 +1,5 @@
 <% content_for :body do %>
   <%= render partial: 'runners' %>
-  <%= render partial: 'naf/shared/information_container', locals: { record_name: "Jobs" } %>
   <%= render partial: 'search_container' %>
   <%= render partial: 'naf/shared/select_per_page' %>
 

data/app/views/naf/historical_jobs/index.json.erb

@@ -8,11 +8,11 @@
       end
     end
 
-    job[12] = link_to image_tag('papertrail_job.png',
+    job[12] = link_to image_tag('job.png',
                                 class: 'action',
-                                title: "View job(id: #{job[0]}, title: #{job[4]}) log in Papertrail"),
-                                job[12],
-                                { target: '_blank', class: "papertrail", id: job[0] }
+                                title: "View job(id: #{job[0]}, title: #{job[4]}) log"),
+                                url_for({ controller: 'log_viewer', action: 'index', record_id: job[0], record_type: 'job' }),
+                                { target: '_blank', id: job[0] }
 
     if job[10] == "Running" || job[10] == 'Queued' || job[10] == 'Waiting'
       job[12] << "&nbsp;&nbsp;&nbsp;".html_safe

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

@@ -1,41 +1,14 @@
 <% content_for :body do %>
   <div id="flash_message">
-      <% unless notice.blank? %>
-        <script type='text/javascript'>
-          jQuery("<p id='notice'><%= notice %></p>")
-              .appendTo('#flash_message')
-              .slideDown().delay(5000).slideUp();
-        </script>
-      <% end %>
+    <% unless notice.blank? %>
+      <script type='text/javascript'>
+        jQuery("<p id='notice'><%= notice %></p>")
+          .appendTo('#flash_message')
+          .slideDown().delay(5000).slideUp();
+      </script>
+    <% end %>
   </div>
 
-  <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 %>;
-        var url = '/job_system/historical_jobs/' + id;
-        jQuery.ajax({
-          url:url,
-          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>
-
   <div id="record">
     <h2>Historical Job</h2>
     <% if flash[:error] -%>
@@ -44,8 +17,6 @@
 
     <%= link_to 'Back to Jobs', historical_jobs_path %>
     &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
-    <%= link_to 'Edit', edit_historical_job_path(@historical_job) %>
-    &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;
     <%= link_to "Add Affinity", new_historical_job_historical_job_affinity_tab_path(@historical_job) %>
     </br>
     </br>
@@ -125,7 +96,7 @@
         </tr>
         <tr>
           <td>Tags</td>
-          <td><%= @historical_job.tags %></td>
+          <td><%= @historical_job.running_job.try(:tags) %></td>
         </tr>
         <tr>
           <td>Request To Terminate</td>
@@ -155,16 +126,18 @@
           <td><%= link_to "Historical Job Affinity Tabs",
                   historical_job_historical_job_affinity_tabs_path(@historical_job.id) %>
           </td>
-          <td><%= @historical_job.affinities.map(&:affinity_name).join(', ') %></td>
-        </tr>
-        <tr>
-          <td>Terminate Job</td>
-          <td><%= link_to image_tag('terminate.png',
-            class: 'action',
-            title: "Terminate job(id: #{@historical_job.id}, title: #{@historical_job.title})"),
-            "#", { class: "terminate" }
-          %></td>
-        </tr>
+          <td><%= @logical_job.affinities %></td>
+        </tr>
+        <% if ['Running', 'Waiting', 'Queued'].include?(@logical_job.status) -%>
+          <tr>
+            <td>Terminate Job</td>
+            <td><%= link_to image_tag('terminate.png',
+              class: 'action',
+              title: "Terminate job(id: #{@historical_job.id}, title: #{@historical_job.title})"),
+              "#", { class: "terminate" }
+            %></td>
+          </tr>
+        <% end %>
       </tbody>
     </table>
     </br>
@@ -190,12 +163,45 @@
       </tbody>
     </table>
     </br>
+    <%= render partial: 'naf/log_viewer/log_layout', locals: { record_id: @historical_job.id, record_type: 'job' } %>
 
-    <h2>Stdout</h2>
-    <iframe src="<%= naf_papertrail_link(@historical_job, true) %>" id="stdout" class="scrollable-output">
-      Your browser doesn't support iframe!
-    </iframe>
   </div>
 <% end %>
 
+
 <%= render partial: 'naf/shared/application' %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output' } %>
+<%= render partial: 'naf/log_viewer/log_display',
+           locals: { record_id: @historical_job.id,
+                     status: @logical_job.status,
+                     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 %>;
+        var url = '/job_system/historical_jobs/' + id;
+        jQuery.ajax({
+          url: url,
+          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 %>

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

@@ -0,0 +1,65 @@
+<div id='naf'>
+  <div id="fluid">
+    <div id='bd'>
+      <div id="record">
+        <FONT FACE= "Courier New">
+        <div id="stdout" class="scrollable-output-expanded"></div>
+        </br>
+        <FONT FACE= "Arial">
+
+        <div id="stdout_header">
+          <div>
+            <%= render partial: 'search_options' %>
+            <div style="width: 100%; display: table;">
+              <div style="display: table-row">
+                <div style="width: 600px; display: table-cell;">
+                  <%= label_tag 'From:' %>
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_from', dropdown_width: 'width: 15%;' } %>
+                  </br>
+                  <%= label_tag 'To:' %>&nbsp;&nbsp;&nbsp;&nbsp;
+                  <%= render partial: 'naf/shared/date_select', locals: { prefix: 'date_select_to', dropdown_width: 'width: 15%;' } %>
+                </div>
+                <div style="display: table-cell;">
+                  <strong style="margin-left: 10%; size: 10%">Job Information</strong>
+                  <table id='naf_table_show' style="margin-left: 10%; width: 92.5%">
+                    <thead>
+                      <tr>
+                        <td width="7%">ID</td>
+                        <td>Command</td>
+                        <td width="30%">Server</td>
+                        <td width="8%">Pid</td>
+                        <td width="15%">Status</td>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td><%= @job.id %></td>
+                        <td style="white-space: pre-wrap;"><%= @job.command %></td>
+                        <% logical_job = ::Logical::Naf::Job.new(@job) %>
+                        <td><%= logical_job.runner %></td>
+                        <td><%= @job.pid %></td>
+                        <td class="<%= add_color(logical_job.status) %>"><%= logical_job.status %></td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+            </div>
+            </br>
+
+            <%= submit_tag("Search the logs", id: 'log_search_submit') %>
+            &nbsp;&nbsp;&nbsp;
+            <%= link_to 'Back to Job', { controller: 'historical_jobs', action: 'show', id: @job.id } %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render partial: 'update_page_title', locals: { title: "Job(#{@job.id}) Logs" } %>
+<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output-expanded' } %>
+<%= render partial: 'log_display', locals: { record_id: @job.id,
+                                             status: logical_job.status,
+                                             logs_url: "#{http_protocol}#{logical_job.runner}#{naf.logs_log_parsers_path}",
+                                             record_type: 'job' } %>

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

@@ -0,0 +1,259 @@
+<% content_for :javascripts do %>
+  <script type='text/javascript'>
+    var record_id = "<%= record_id %>";
+    var logical_type = null;
+    setLogicalType();
+    var logs_url = "<%= logs_url %>";
+    var search_params = null;
+    var regex_options = null;
+    var search_command = false;
+    var grep = false;
+    var search_date_from_year = '';
+    var search_date_from_month = '';
+    var search_date_from_day = '';
+    var search_date_from_hour = '';
+    var search_date_from_minute = '';
+    var search_date_to_year = '';
+    var search_date_to_month = '';
+    var search_date_to_day = '';
+    var search_date_to_hour = '';
+    var search_date_to_minute = '';
+    var show_help_window = false;
+    var logs = null;
+    var old_height = null;
+    var new_height = null;
+    var log_type = 'new';
+    var newest_log = null;
+    var read_from_s3 = false;
+    var last_file_checked = null;
+    var newest_file_checked = null;
+
+    jQuery(document).ready(function () {
+      jQuery(".description").hide();
+      getLog();
+      jQuery('#stdout').css('width', jQuery('#stdout').width());
+
+      jQuery('#log_search_submit').click(function () {
+        initializeVariables();
+
+        if(checkSearchDate(search_date_from_year, search_date_from_month, search_date_from_day,
+          search_date_from_hour, search_date_from_minute)){
+          log_type = 'old';
+          callAjax();
+        }
+        else{
+          resetDateFilters();
+          jQuery('#stdout').empty();
+          jQuery('#stdout').append('If specifying a date search, select a value for each dropdown (year/month/day/hour/minute)');
+        }
+      });
+
+      jQuery('#stdout').scroll(function (){
+        if(jQuery('#stdout').scrollTop() == 0 && jQuery('#stdout').text() != 'No logs were found for this search query! '){
+          log_type = 'old'
+          callAjax();
+        }
+        else if(jQuery('#stdout')[0].scrollHeight - jQuery('#stdout').scrollTop() == jQuery('#stdout').innerHeight()){
+          log_type = 'new'
+          newest_log = jQuery('#stdout')[0].children.item(jQuery('#stdout')[0].children.length - 1).textContent;
+
+          if(jQuery('#auto_scroll').text() == 'Auto Scroll (OFF)'){
+            jQuery('#auto_scroll').click();
+          }
+        }
+        else{
+          if(jQuery('#auto_scroll').text() == 'Auto Scroll (ON)'){
+            setAutoScrollOff();
+          }
+        }
+      });
+
+      jQuery("#regex_help").click(function() {
+        if(show_help_window == false){
+          jQuery(".description").show();
+          show_help_window = true;
+        }
+        else{
+          jQuery(".description").hide();
+          show_help_window = false;
+        }
+      });
+
+      jQuery('#auto_scroll').click(function(){
+        if(jQuery('#auto_scroll').text() == 'Auto Scroll (ON)'){
+          setAutoScrollOff();
+        }
+        else{
+          setAutoScrollOn();
+          jQuery("#stdout").scrollTop(jQuery('#stdout')[0].scrollHeight);
+          getLog();
+        }
+      });
+    });
+
+    function callAjax(){
+      jQuery.ajax({
+        url: logs_url,
+        dataType: 'jsonp',
+        jsonpCallback: 'convertToJsonCallback',
+        xhrFields: {
+          withCredentials: true
+        },
+        data: {
+                'record_id': record_id,
+                'logical_type': logical_type,
+                'log_type': log_type,
+                'newest_log': newest_log,
+                'read_from_s3': read_from_s3,
+                'last_file_checked': last_file_checked,
+                'newest_file_checked': newest_file_checked,
+                'search_params': jQuery('#log_search').val(),
+                'regex_options': jQuery('#regex_options').val(),
+                'grep': grep,
+                'from_time': [search_date_from_year,
+                              search_date_from_month,
+                              search_date_from_day,
+                              search_date_from_hour,
+                              search_date_from_minute],
+                'to_time': [search_date_to_year,
+                            search_date_to_month,
+                            search_date_to_day,
+                            search_date_to_hour,
+                            search_date_to_minute]
+              },
+        success: function(response) {
+          logs = response['logs'];
+          updateVariables(response);
+
+          if(search_command == true){
+            jQuery('#stdout').text('')
+            jQuery('#stdout').append(logs);
+            if(jQuery('#stdout').text() == '') {
+              logs = "No logs were found for this search query!<br>";
+              setAutoScrollOff();
+            }
+            jQuery("#stdout").scrollTop(jQuery('#stdout')[0].scrollHeight);
+
+            search_command = false;
+          }
+          else{
+            if(logs == '' && jQuery('#stdout')[0].children.length == 0) {
+              logs = "&nbsp;&nbsp;<span>No logs were found!<br></span>";
+              setAutoScrollOff();
+            }
+
+            if(logs != ''){
+              if(log_type == 'new'){
+                jQuery('#stdout').append(logs);
+                jQuery("#stdout").scrollTop(jQuery('#stdout')[0].scrollHeight);
+              }
+              else{
+                jQuery('#stdout').prepend(logs);
+                log_type = 'new';
+                if(old_height == null && new_height == null){
+                  old_height = jQuery('#stdout')[0].scrollHeight;
+                  new_height = jQuery('#stdout')[0].scrollHeight;
+                  jQuery("#stdout").scrollTop(jQuery('#stdout')[0].scrollHeight - new_height + 1);
+                }
+                else{
+                  old_height = new_height;
+                  new_height = jQuery('#stdout')[0].scrollHeight;
+                  jQuery("#stdout").scrollTop(new_height - old_height);
+                }
+              }
+            }
+          }
+        },
+        error: function(response) {
+          jQuery('#stdout').prepend('Something went wrong, retry your search.');
+        }
+      });
+    }
+
+    function getLog() {
+      if(jQuery('#auto_scroll').text() == 'Auto Scroll (ON)'){
+        callAjax();
+        setTimeout(getLog, 5000);
+      }
+    }
+
+    function initializeVariables(){
+      newest_log = null;
+      logs = null;
+      last_file_checked = null;
+      newest_file_checked = null;
+      show_help_window = false;
+      search_command = true;
+      grep = jQuery('#grep').is(':checked');
+      search_params = jQuery('#log_search').val();
+      regex_options = jQuery('#regex_options').val();
+      search_date_from_year = jQuery('#date_select_from_year').val();
+      search_date_from_month = jQuery('#date_select_from_month').val();
+      search_date_from_day = jQuery('#date_select_from_day').val();
+      search_date_from_hour = jQuery('#date_select_from_hour').val();
+      search_date_from_minute = jQuery('#date_select_from_minute').val();
+      search_date_to_year = jQuery('#date_select_to_year').val();
+      search_date_to_month = jQuery('#date_select_to_month').val();
+      search_date_to_day = jQuery('#date_select_to_day').val();
+      search_date_to_hour = jQuery('#date_select_to_hour').val();
+      search_date_to_minute = jQuery('#date_select_to_minute').val();
+    }
+
+    function resetDateFilters(){
+      search_date_from_year = '';
+      search_date_from_month = '';
+      search_date_from_day = '';
+      search_date_from_hour = '';
+      search_date_from_minute = '';
+      search_date_to_year = '';
+      search_date_to_month = '';
+      search_date_to_day = '';
+      search_date_to_hour = '';
+      search_date_to_minute = '';
+    }
+
+    function updateVariables(response){
+      if(response['read_from_s3'] != ''){
+        read_from_s3 = response['read_from_s3'];
+      }
+      if(response['last_file_checked'] != ''){
+        last_file_checked = response['last_file_checked'];
+      }
+      if(response['newest_file_checked'] != ''){
+        newest_file_checked = response['newest_file_checked'];
+      }
+      if(response['newest_log'] != ''){
+        newest_log = response['newest_log'];
+      }
+    }
+
+    function checkSearchDate(year, month, day, hour, minute){
+      return (year == '' && month == '' && day == '' && hour == '' && minute == '') ||
+      (year != '' && month != '' && day != '' && hour != '' && minute != '')
+    }
+
+    function setLogicalType(){
+      logical_type = '::Logical::Naf::LogParser::';
+      if('<%= record_type %>' == 'machine'){
+        logical_type += 'Machine';
+      }
+      else if('<%= record_type %>' == 'runner'){
+        logical_type += 'Runner';
+      }
+      else if('<%= record_type %>' == 'job'){
+        logical_type += 'Job';
+      }
+    }
+
+    function setAutoScrollOn(){
+      jQuery('#auto_scroll').text('Auto Scroll (ON)');
+      jQuery('#auto_scroll').removeClass('auto_scroll_off');
+    }
+
+    function setAutoScrollOff(){
+      jQuery('#auto_scroll').text('Auto Scroll (OFF)');
+      jQuery('#auto_scroll').addClass('auto_scroll_off');
+    }
+
+  </script>
+<% end %>