naf 1.1.4 → 2.0.0

data/app/controllers/naf/affinities_controller.rb

@@ -4,7 +4,7 @@ module Naf
     before_filter :set_cols_and_attributes
 
     def index
-      @affinities = Naf::Affinity.all
+      @affinities = ::Naf::Affinity.includes(:affinity_classification).all
     end
 
     def show

data/app/controllers/naf/applications_controller.rb

@@ -44,8 +44,11 @@ module Naf
 
     def create
       @application = Naf::Application.new(params[:application])
+      check_application_run_group_name
+      set_application_run_group_name
       if @application.save
         app_schedule = @application.application_schedule
+        @application.update_attributes(params[:application])
         if app_schedule.present?
           prerequisites =
           app_schedule.prerequisites.map do |prerequisite|

data/app/controllers/naf/historical_job_affinity_tabs_controller.rb

@@ -2,7 +2,7 @@ module Naf
   class HistoricalJobAffinityTabsController < Naf::ApplicationController
 
     before_filter :set_cols_and_attributes
-  
+
     def index
       @rows = []
       if params[:historical_job_id]

data/app/controllers/naf/historical_jobs_controller.rb

@@ -1,6 +1,7 @@
 module Naf
   class HistoricalJobsController < Naf::ApplicationController
     include Naf::ApplicationHelper
+    helper Naf::TimeHelper
 
     before_filter :set_rows_per_page
     before_filter :set_search_status
@@ -102,10 +103,6 @@ module Naf
       end
     end
 
-    def edit
-      @historical_job = Naf::HistoricalJob.find(params[:id])
-    end
-
     def update
       respond_to do |format|
         @historical_job = Naf::HistoricalJob.find(params[:id])
@@ -119,6 +116,7 @@ module Naf
 
             if running_job = ::Naf::RunningJob.find_by_id(params[:id])
               running_job.update_attributes(request_to_terminate: true)
+              @historical_job.update_attributes(request_to_terminate: true)
             end
           end
 
@@ -150,7 +148,6 @@ module Naf
       else
         hash[:application_url] = nil
       end
-      hash[:papertrail_url] = naf_papertrail_link(job)
 
       return hash
     end

data/app/controllers/naf/log_parsers_controller.rb

@@ -0,0 +1,16 @@
+module Naf
+  class LogParsersController < Naf::ApplicationController
+
+    def logs
+      response = params['logical_type'].constantize.new(params).logs
+      if response.present?
+        success = true
+      else
+        success = false
+      end
+
+      render json: "convertToJsonCallback(" + { success: success }.merge(response).to_json + ")"
+    end
+
+  end
+end

data/app/controllers/naf/log_viewer_controller.rb

@@ -0,0 +1,19 @@
+module Naf
+  class LogViewerController < Naf::ApplicationController
+
+  	def index
+       if params['record_type'] == 'job'
+        @job = ::Naf::HistoricalJob.find_by_id(params['record_id'].to_i)
+        @status = ::Logical::Naf::Job.new(@job).status
+        @partial = 'job_logs'
+      elsif params['record_type'] == 'machine'
+        @machine = ::Naf::Machine.find_by_id(params['record_id'].to_i)
+        @partial = 'machine_logs'
+      elsif params['record_type'] == 'runner'
+        @runner = ::Naf::MachineRunner.find_by_id(params['record_id'].to_i)
+        @partial = 'runner_logs'
+      end
+    end
+
+  end
+end

data/app/controllers/naf/machine_affinity_slots_controller.rb

@@ -6,7 +6,7 @@ module Naf
     def index
       @rows = []
       if params[:machine_id]
-        @rows = Naf::MachineAffinitySlot.where(machine_id: params[:machine_id])
+        @rows = Naf::MachineAffinitySlot.includes(:machine, :affinity).where(machine_id: params[:machine_id])
       end
       render template: 'naf/datatable'
     end

data/app/controllers/naf/machine_runners_controller.rb

@@ -22,5 +22,17 @@ module Naf
       @machine_runner = Naf::MachineRunner.find(params[:id])
     end
 
+    def runner_count
+      running = ::Naf::MachineRunner.running.uniq.count
+      winding_down = ::Naf::MachineRunner.winding_down.uniq.count
+      down = ::Naf::MachineRunner.dead_count
+
+      render json: {
+        running: running,
+        winding_down: winding_down,
+        down: down
+      }
+    end
+
   end
 end

data/app/controllers/naf/machines_controller.rb

@@ -2,6 +2,7 @@ module Naf
   class MachinesController < Naf::ApplicationController
 
     include Naf::ApplicationHelper
+    include Naf::TimeHelper
 
     before_filter :set_rows_per_page
 
@@ -21,7 +22,7 @@ module Naf
           machine = []
           @total_records = Naf::Machine.count(:all)
           Logical::Naf::Machine.all(filter).map(&:to_hash).map do |hash|
-            add_urls(hash).map do |key, value|
+            hash.map do |key, value|
               value = '' if value.nil?
               machine << value
             end
@@ -36,7 +37,7 @@ module Naf
     end
 
     def show
-      @machine = Naf::Machine.find(params[:id])
+      @machine = Naf::Machine.includes(:machine_affinity_slots).find(params[:id])
     end
 
     def new
@@ -81,15 +82,12 @@ module Naf
       end
     end
 
-    private
-
-    def add_urls(hash)
-      machine = ::Naf::Machine.find(hash[:id])
-      hash[:papertrail_url] = naf_papertrail_link(machine)
-      hash[:papertrail_runner_url] = naf_papertrail_link(machine, true)
-
-      hash
+    def last_checked_schedule_at
+      render json: {
+        last_checked_schedule_at: time_format(::Naf::Machine.last_time_schedules_were_checked)
+      }
     end
 
+
   end
 end

data/app/controllers/naf/status_controller.rb

@@ -0,0 +1,12 @@
+module Naf
+  class StatusController < Naf::ApplicationController
+
+    def index
+      @machines = []
+      ::Naf::Machine.where(enabled: true).all.each do |machine|
+        @machines << ::Logical::Naf::Machine.new(machine).status
+      end
+    end
+
+  end
+end

data/app/helpers/naf/application_helper.rb

@@ -20,16 +20,17 @@ module Naf
     NAF_READ_ONLY_RESOURCES = []
     NAF_CREATE_BLOCKED_RESOURCES = []
     NAF_ALL_VISIBLE_RESOURCES = {
-                                  "historical_jobs" => "",
-                                  "applications" => "",
-                                  "machines" => "",
-                                  "runners" => ["machine_runners",
-                                                "machine_runner_invocations"],
-                                  "affinities" => "",
-                                  "loggers" => ["logger_styles", "logger_names"],
-                                  "janitorial_assignments" => ["janitorial_archive_assignments",
-                                                               "janitorial_create_assignments",
-                                                               "janitorial_drop_assignments"]
+                                  'historical_jobs' => '',
+                                  'applications' => '',
+                                  'machines' => '',
+                                  'runners' => ['machine_runners',
+                                                'machine_runner_invocations'],
+                                  'affinities' => '',
+                                  'loggers' => ['logger_styles', 'logger_names'],
+                                  'janitorial_assignments' => ['janitorial_archive_assignments',
+                                                               'janitorial_create_assignments',
+                                                               'janitorial_drop_assignments'],
+                                  'status' => ''
                                 }
 
     def naf_tabs
@@ -221,34 +222,6 @@ module Naf
       end
     end
 
-    def include_actions_in_table?
-      current_page?(naf.root_url) or
-      current_page?(controller: 'applications', action: 'index') or
-        current_page?(controller: 'historical_jobs', action: 'index')
-    end
-
-    def naf_papertrail_link(record, runner = false)
-      if group_id = Naf.papertrail_group_id
-        url = "http://www.papertrailapp.com/groups/#{group_id}/events"
-        if record.kind_of?(::Naf::HistoricalJob) || record.kind_of?(::Logical::Naf::Job)
-          if record.pid.present?
-            query = "jid(#{record.id})"
-            url << "?q=#{CGI.escape(query)}"
-          end
-        elsif record.kind_of?(::Naf::Machine) || record.kind_of?(::Logical::Naf::Machine)
-          query = record.server_name
-          unless query.nil?
-            query << " runner" if runner
-            url << "?q=#{CGI.escape(query)}"
-          end
-        end
-      else
-        url = "http://www.papertrailapp.com/dashboard"
-      end
-
-      return url
-    end
-
     def naf_link_to_remove_fields(name, f)
       f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)")
     end
@@ -271,5 +244,13 @@ module Naf
       end
     end
 
+    def http_protocol
+      if ['staging', 'production'].include?(Rails.env)
+        'https://'
+      else
+        'http://'
+      end
+    end
+
   end
 end

data/app/helpers/naf/time_helper.rb

@@ -0,0 +1,37 @@
+module Naf
+  module TimeHelper
+
+    def time_difference(value, started_at = nil)
+      seconds = value % 60
+      value = (value - seconds) / 60
+      minutes = value % 60
+      value = (value - minutes) / 60
+      hours = value % 24
+      value = (value - hours) / 24
+      days = value % 7
+      more_hours = hours + days * 24 if days > 0
+
+      if started_at.present?
+        "-#{hours.to_i + more_hours.to_i}h#{minutes.to_i}m, #{started_at.localtime.strftime("%Y-%m-%d %r")}"
+      else
+        if days < 2
+          "-#{hours.to_i + more_hours.to_i}h#{minutes.to_i}m#{seconds.to_i}s"
+        else
+          "-#{days.to_i}d#{hours.to_i}h#{minutes.to_i}m#{seconds.to_i}s"
+        end
+      end
+    end
+
+    def time_format(time)
+      return '' if time.nil?
+
+      value = Time.zone.now - time
+      if value < 60
+        return "#{value.to_i} seconds ago"
+      else
+        return time_difference(value)
+      end
+    end
+
+  end
+end

data/app/models/logical/naf/application.rb

@@ -54,9 +54,11 @@ module Logical
           if search.present? and search[field].present?
             application_scope =
             if field == :application_run_group_name
-              application_scope.where(["lower(#{::Naf.schema_name}.application_schedules.application_run_group_name) ~ ?", search[field].downcase])
+              application_scope.where(
+                ["lower(#{::Naf.schema_name}.application_schedules.application_run_group_name) ~ ?", Regexp.escape(search[field].downcase)]
+              )
             else
-              application_scope.where(["lower(#{field}) ~ ?", search[field].downcase])
+              application_scope.where(["lower(#{field}) ~ ?", Regexp.escape(search[field].downcase)])
             end
           end
         end
@@ -157,25 +159,17 @@ module Logical
       end
 
       def affinities
-        affinity_tab_records = @app.application_schedule.try(:application_schedule_affinity_tabs)
-        return "" if affinity_tab_records.nil?
-
-        affinity_tabs = ""
-        affinity_tab_records.each do |tab|
-          if tab.affinity.affinity_short_name.present?
-            affinity_tabs << tab.affinity.affinity_short_name
-          else
-            affinity_tabs << tab.affinity.affinity_name
-          end
-
-          if tab.affinity_parameter.present? && tab.affinity_parameter > 0
-            affinity_tabs << "(#{tab.affinity_parameter}), "
+        @app.application_schedule.application_schedule_affinity_tabs.map do |tab|
+          if tab.affinity_short_name.present?
+            if tab.affinity_parameter.present? && tab.affinity_parameter > 0
+              tab.affinity_short_name + "(#{tab.affinity_parameter})"
+            else
+              tab.affinity_short_name
+            end
           else
-            affinity_tabs << ", "
+            tab.affinity_classification_name + '_' + tab.affinity_name
           end
-        end
-
-        affinity_tabs[0..-3]
+        end.join(", \n")
       end
 
     end

data/app/models/logical/naf/construction_zone/boss.rb

@@ -87,7 +87,7 @@ module Logical::Naf::ConstructionZone
             :application_run_group_limit => number_of_jobs,
             :application_run_group_restriction => ::Naf::ApplicationRunGroupRestriction.limited_per_machine
           }.merge(parameters)
-          machine_parameters[:affinities] = 
+          machine_parameters[:affinities] =
             [machine.affinity] + if machine_parameters[:affinities].nil?
                                    []
                                  elsif machine_parameters[:affinities].is_a? Array

data/app/models/logical/naf/construction_zone/foreman.rb

@@ -35,7 +35,7 @@ module Logical::Naf::ConstructionZone
         #(::Naf::QueuedJob.where(:application_run_group_name => application_run_group_name).count +
         #::Naf::RunningJob.where(:application_run_group_name => application_run_group_name,
         #:started_on_machine_id => @machine.id).count) >= application_run_group_limit
-        
+
         # XXX just returning false
         false
       elsif application_run_group_restriction.id == ::Naf::ApplicationRunGroupRestriction.limited_per_all_machines.id

data/app/models/logical/naf/job.rb

@@ -5,6 +5,7 @@ module Logical
     class Job
       include ActionView::Helpers::DateHelper
       include ActionView::Helpers::TextHelper
+      include ::Naf::TimeHelper
 
       COLUMNS = [:id,
                  :server,
@@ -147,7 +148,7 @@ module Logical
             if search[field].present?
               conditions << " AND "
               conditions << "lower(#{field}) ~ :#{field}"
-              values[field.to_sym] = search[field].downcase
+              values[field.to_sym] = Regexp.escape(search[field].downcase)
             end
           end
 
@@ -178,7 +179,7 @@ module Logical
               JobStatuses::Terminated.all(conditions)
           end
           sql << "LIMIT :limit OFFSET :offset"
-          jobs = ::Naf::HistoricalJob.find_by_sql([sql, values])
+          jobs = ::Naf::HistoricalJob.find_by_sql([sql, values]).uniq
 
           jobs.map{ |physical_job| new(physical_job) }
         else
@@ -225,7 +226,7 @@ module Logical
           job_scope = job_scope.where(field => search[field]) if search[field].present?
         end
         SEARCH_FIELDS.each do |field|
-          job_scope = job_scope.where(["lower(#{field}) ~ ?", search[field].downcase]) if search[field].present?
+          job_scope = job_scope.where(["lower(#{field}) ~ ?", Regexp.escape(search[field].downcase)]) if search[field].present?
         end
 
         job_scope
@@ -270,7 +271,7 @@ module Logical
           if value < 60
             "#{value.to_i} seconds ago, #{@job.started_at.localtime.strftime("%Y-%m-%d %r")}"
           elsif value < 172_800
-            time_difference(value)
+            time_difference(value, @job.started_at)
           elsif value >= 172_800
             "#{time_ago_in_words(@job.started_at, true)} ago, #{@job.started_at.localtime.strftime("%Y-%m-%d %r")}"
           else
@@ -281,27 +282,6 @@ module Logical
         end
       end
 
-      def time_difference(value, time_format_on=true)
-        seconds = value % 60
-        value = (value - seconds) / 60
-        minutes = value % 60
-        value = (value - minutes) / 60
-        hours = value % 24
-        value = (value - hours) / 24
-        days = value % 7
-        more_hours = hours + days * 24 if days > 0
-
-        if time_format_on
-          "-#{hours.to_i}h#{minutes.to_i}m, #{@job.started_at.localtime.strftime("%Y-%m-%d %r")}"
-        else
-          if days < 2
-            "-#{more_hours.to_i}h#{minutes.to_i}m#{seconds.to_i}s"
-          else
-            "-#{days.to_i}d#{hours.to_i}h#{minutes.to_i}m#{seconds.to_i}s"
-          end
-        end
-      end
-
       def has_started?
         @job.started_at.present?
       end
@@ -313,9 +293,13 @@ module Logical
       def run_time
         if @job.started_at.present?
           if @job.finished_at.present?
-            time_difference(@job.finished_at - @job.started_at, false)[1..-1]
+            if @job.started_at > @job.finished_at
+              time_difference(@job.started_at - @job.finished_at)[1..-1]
+            else
+              time_difference(@job.finished_at - @job.started_at)[1..-1]
+            end
           else
-            time_difference(Time.zone.now - @job.started_at, false)[1..-1]
+            time_difference(Time.zone.now - @job.started_at)[1..-1]
           end
         else
           ""
@@ -331,27 +315,48 @@ module Logical
       end
 
       def affinities
-        @job.job_affinities.map do |job_affinity|
-          if job_affinity.present?
-            if job_affinity.affinity_short_name.present?
-              job_affinity.affinity_short_name
+        @job.historical_job_affinity_tabs.map do |tab|
+          if tab.affinity_short_name.present?
+            if tab.affinity_parameter.present? && tab.affinity_parameter > 0
+              tab.affinity_short_name + "(#{tab.affinity_parameter})"
             else
-              job_affinity.affinity_classification_name + '_' + job_affinity.affinity_name
+              tab.affinity_short_name
             end
+          else
+            tab.affinity_classification_name + '_' + tab.affinity_name
           end
         end.join(", \n")
       end
 
       def tags
-        if @job.tags.present?
+        if @job.running_job.try(:tags).present?
           # Only show custom visible tags
-          job_tags = @job.tags.gsub(/[{}]/,'').split(',')
+          job_tags = @job.running_job.tags.gsub(/[{}]/,'').split(',')
           (job_tags.select { |elem| !['$', '_'].include?elem[0] }).join(', ')
         else
           nil
         end
       end
 
+      def runner
+        if @job.machine_runner_invocation.present?
+          machine = @job.machine_runner_invocation.machine_runner.machine
+          if machine.present?
+            if machine.server_name.present?
+              machine.server_name.to_s
+            else
+              if Rails.env == 'development'
+                "localhost:#{Rails::Server.new.options[:Port]}"
+              else
+                machine.server_address
+              end
+            end
+          end
+        else
+          ''
+        end
+      end
+
     end
   end
 end