naf 2.1.9 → 2.1.10

data/Gemfile

@@ -10,7 +10,7 @@ end
 gem 'jquery-ui-rails'
 gem 'awesome_print'
 gem 'will_paginate'
-gem 'facter'
+gem 'facter', '1.7.5'
 gem 'shoulda-matchers', '2.0.0'
 gem 'timecop', '0.4.5'
 gem 'yajl-ruby'

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,16 @@
 = Release Notes
 
+=== Version 2.1.10
+Bug fixes:
+* LogArchiver correctly removes files and directories
+* Disabled machine is highlighted in red
+* Custom validation for machine marked as enabled and deleted
+* UI links behave correctly if the engine's mount path is different than '/job_system'
+
+Changes:
+* Improved memory management
+* Removed machine log display
+
 === Version 2.1.9
 Bug fixes:
 * Logical::Naf::ConstructionZone doesn't properly propagate affinity parameters

data/app/assets/javascripts/dataTablesTemplates/applications.js

@@ -63,12 +63,12 @@ jQuery(document).ready(function() {
 
 function addLinkToApplication(nRow, aData) {
   var id = aData[0];
-  var row = jQuery('<a href="/job_system/applications/' + id + '">' + id + '</a>' );
+  var row = jQuery('<a href="applications/' + id + '">' + id + '</a>' );
   jQuery('td:nth-child(1)', nRow).empty().append(row);
 }
 
 function colorizationDeletedOrHidden(nRow, aData) {
-  if (aData[6] == 'true') {
+  if (aData[7] == true) {
     jQuery(nRow).addClass('deleted_or_hidden');
   }
 }

data/app/assets/javascripts/dataTablesTemplates/jobs.js

@@ -59,19 +59,19 @@ jQuery(document).ready(function() {
       return false;
     }
     var id = jQuery(this).attr('id');
-    var url = '/job_system/historical_jobs/' + 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();
-              jQuery('#datatable').dataTable().fnDraw();
-          }
+        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();
+          jQuery('#datatable').dataTable().fnDraw();
+        }
       }
     });
   });
@@ -79,7 +79,7 @@ jQuery(document).ready(function() {
 
 function addLinkToJob(nRow, aData) {
   var id = aData[0];
-  var row = jQuery('<a href="/job_system/historical_jobs/' + id + '">' + id + '</a>' );
+  var row = jQuery('<a href="job_system/historical_jobs/' + id + '">' + id + '</a>' );
   jQuery('td:nth-child(1)', nRow).empty().append(row);
 }
 

data/app/assets/javascripts/dataTablesTemplates/machine_runners.js

@@ -49,7 +49,7 @@ jQuery(document).ready(function() {
       return false;
     }
     var id = jQuery(this).attr('id');
-    var url = '/job_system/machine_runner_invocations/' + id;
+    var url = 'machine_runner_invocations/' + id;
     jQuery.ajax({
       url: url,
       type: 'POST',

data/app/assets/javascripts/dataTablesTemplates/machines.js

@@ -47,18 +47,18 @@ jQuery(document).ready(function() {
       return false;
     }
     var id = jQuery(this).attr('id');
-    var url = '/job_system/machines/' + id;
+    var url = 'machines/' + id;
     jQuery.ajax({
       url: url,
       type: 'POST',
       dataType: 'json',
       data: { "machine[marked_down]": 1, "terminate": true, "_method": "put" },
       success:function (data) {
-          if (data.success) {
-              jQuery("<p id='notice'>Machine was marked down!</p>").
-                  appendTo('#flash_message').slideDown().delay(5000).slideUp();
-              jQuery('#datatable').dataTable().fnDraw();
-          }
+        if (data.success) {
+          jQuery("<p id='notice'>Machine was marked down!</p>").
+            appendTo('#flash_message').slideDown().delay(5000).slideUp();
+          jQuery('#datatable').dataTable().fnDraw();
+        }
       }
     });
   });
@@ -66,12 +66,12 @@ jQuery(document).ready(function() {
 
 function addLinkToMachines(nRow, aData) {
   var id = aData[0];
-  var row = jQuery('<a href="/job_system/machines/' + id + '">' + id + '</a>' );
+  var row = jQuery('<a href="machines/' + id + '">' + id + '</a>' );
   jQuery('td:nth-child(1)', nRow).empty().append(row);
 }
 
 function colorizationDeletedOrHidden(nRow, aData) {
-  if (aData[5] == 'true') {
+  if (aData[4] == false) {
     jQuery(nRow).addClass('deleted_or_hidden');
   }
 }

data/app/controllers/naf/log_viewer_controller.rb

@@ -6,9 +6,6 @@ module Naf
         @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'

data/app/models/logical/naf/log_parser/base.rb

@@ -94,8 +94,6 @@ module Logical::Naf
           parser.parse(json) do |log|
             if self.class.to_s == 'Logical::Naf::LogParser::Runner'
               log['id'] = get_invocation_id(file.scan(UUID_REGEX).first)
-            elsif self.class.to_s == 'Logical::Naf::LogParser::Machine'
-              log['job_id'] = get_job_id(file)
             end
             filter_log_messages(log)
           end

data/app/models/logical/naf/log_parser/runner.rb

@@ -22,7 +22,7 @@ module Logical::Naf
       end
 
       def invocation_link(id)
-        "<a href=\"\/job_system\/machine_runner_invocations\/#{id}\" style=\"font-weight:bold; color: #333399\">invocation(#{id})</a>"
+        "<a href=\"machine_runner_invocations\/#{id}\" style=\"font-weight:bold; color: #333399\">invocation(#{id})</a>"
       end
 
       def sort_jsons
@@ -35,6 +35,8 @@ module Logical::Naf
       end
 
       def retrieve_log_files_from_s3
+        return [] unless record_id.present?
+
         uuids = ::Naf::MachineRunner.
           joins(:machine_runner_invocations).
           where("#{Naf.schema_name}.machine_runners.id = ?", record_id).

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

@@ -7,8 +7,8 @@ module Logical
       DATE_REGEX = /((\d){4}-(\d){2}-(\d){2} (\d){2}:(\d){2}:(\d){2} UTC)/
 
       def log_files
-        tree = bucket.objects.with_prefix(prefix).as_tree
-        directories = tree.children.select(&:branch?).collect(&:prefix).uniq
+        tree = bucket.objects.with_prefix(job_log_prefix).as_tree
+        directories = tree.children.select(&:branch?).collect(&:job_log_prefix).uniq
 
         files = []
         directories.each do |directory|
@@ -21,8 +21,8 @@ module Logical
       end
 
       def runner_log_files
-        tree = bucket.objects.with_prefix(prefix(true)).as_tree
-        directories = tree.children.select(&:branch?).collect(&:prefix).uniq
+        tree = bucket.objects.with_prefix(runner_log_prefix).as_tree
+        directories = tree.children.select(&:branch?).collect(&:runner_log_prefix).uniq
 
         files = []
         directories.each do |directory|
@@ -40,7 +40,8 @@ module Logical
       end
 
       def retrieve_job_files(job_id)
-        tree = bucket.objects.with_prefix(prefix + "#{job_id}").as_tree
+        return [] unless job_id.present?
+        tree = bucket.objects.with_prefix(job_log_prefix + "#{job_id}").as_tree
         sort_files(tree.children.select(&:leaf?).collect(&:key))
       end
 
@@ -57,12 +58,12 @@ module Logical
         @bucket ||= s3.buckets[NAF_BUCKET]
       end
 
-      def prefix(runner_logs = false)
-        if runner_logs
-          "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/runners/"
-        else
-          "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/jobs/"
-        end
+      def runner_log_prefix
+        @runner_log_prefix ||= "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/runners/"
+      end
+
+      def job_log_prefix
+        @job_log_prefix ||= "#{NAF_LOG_PATH}/#{creation_time}/#{::Naf::NAF_DATABASE_HOSTNAME}/#{::Naf::NAF_DATABASE}/#{::Naf.schema_name}/jobs/"
       end
 
       def sort_files(files)

data/app/models/naf/machine.rb

@@ -43,6 +43,7 @@ module Naf
                                    greater_than: -2147483648,
                                    less_than: 2147483647
                                  }
+    before_save :check_presence_of_enabled_and_deleted
     before_save :check_blank_values
 
     #---------------------
@@ -261,5 +262,14 @@ module Naf
       self.log_level = nil if self.log_level.blank?
     end
 
+    def check_presence_of_enabled_and_deleted
+      if self.enabled && self.deleted
+        self.errors.add(:enabled, 'should not be true when deleted is true')
+        return false
+      end
+
+      return true
+    end
+
   end
 end

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

@@ -8,14 +8,14 @@ module Process::Naf
     DATE_REGEX = /\d{8}_\d{6}/
     LOG_RETENTION = 1
 
-  	def work
-  		# Use AWS credentials to access S3
-			s3 = AWS::S3.new(access_key_id: AWS_ID,
+    def work
+      # Use AWS credentials to access S3
+      s3 = AWS::S3.new(access_key_id: AWS_ID,
                        secret_access_key: AWS_KEY,
                        ssl_verify_peer: false)
 
-			# Each project will have a specific bucket
-			bucket = s3.buckets[NAF_BUCKET]
+      # Each project will have a specific bucket
+      bucket = s3.buckets[NAF_BUCKET]
       files = log_files
 
       logger.info 'Starting to save files to s3...'
@@ -31,13 +31,13 @@ module Process::Naf
 
       logger.info 'Starting to archive files...'
       archive_old_files(files)
-  	end
+    end
 
-  	private
+    private
 
-  	def project_name
-  		(`git remote -v`).slice(/\/\S+/).sub('.git','')[1..-1]
-  	end
+    def project_name
+      (`git remote -v`).slice(/\/\S+/).sub('.git','')[1..-1]
+    end
 
     def log_files
       files = Dir[NAF_JOBS_LOG_PATH + "*/*"]
@@ -63,12 +63,22 @@ module Process::Naf
 
     def archive_old_files(files)
       copy_files
-      today = Time.zone.now.to_date
       files.each do |file|
         logger.info "Archived file: #{file}"
-        directory = `dirname #{file}`
-        `rm -r #{directory}`
       end
+      File.delete(*files)
+
+      cleanup(NAF_JOBS_LOG_PATH + '*')
+      cleanup(NAF_RUNNERS_LOG_PATH + '*')
+    end
+
+    def cleanup(path)
+      Dir[path].select { |d| File.directory? d }.               # select only directories
+        select { |d| (Dir.entries(d) - %w[ . .. ]).empty? }.    # check if directory is empty
+        each do |d|
+          logger.info "Removing directory #{d}"
+          Dir.rmdir d
+        end
     end
 
     def copy_files

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

@@ -241,6 +241,7 @@ module Process::Naf
     end
 
     def check_schedules
+      logger.debug escape_html("last time schedules were checked: #{::Naf::Machine.last_time_schedules_were_checked}")
       if ::Naf::Machine.is_it_time_to_check_schedules?(@check_schedules_period.minutes)
         logger.debug "it's time to check schedules"
         if ::Naf::ApplicationSchedule.try_lock_schedules
@@ -544,7 +545,23 @@ module Process::Naf
       Facter.clear
       memory_size = Facter.memorysize_mb.to_f
       memory_free = Facter.memoryfree_mb.to_f
-      memory_free_percentage = (memory_free / memory_size) * 100.0
+
+      # Linux breaks out kernel cache-use memory into an SReclaimable stat
+      # in /proc/meminfo which should be counted as free, but facter does not.
+      sreclaimable = 0.0
+      begin
+        File.readlines('/proc/meminfo').each do |l|
+          if l =~ /^(?:SReclaimable):\s+(\d+)\s+\S+/
+            # Convert the memory from Kilobytes to Gigabytes and
+            # store it into sreclaimable
+            sreclaimable = ('%.2f' % [$1.to_f / 1024.0]).to_f
+            break
+          end
+        end
+      rescue
+      end
+
+      memory_free_percentage = ((memory_free + sreclaimable) / memory_size) * 100.0
 
       if (memory_free_percentage >= @minimum_memory_free)
         logger.detail "memory available: #{memory_free_percentage}% (free) >= " +

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

@@ -186,9 +186,8 @@
           return false;
         }
         var id = <%= @historical_job.id %>;
-        var url = '/job_system/historical_jobs/' + id;
         jQuery.ajax({
-          url: url,
+          url: id,
           type:'POST',
           dataType:'json',
           data:{ "historical_job[request_to_terminate]": 1, "historical_job_id": id, "_method": "put" },

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

@@ -36,7 +36,7 @@
               jQuery('#deleted').removeAttr('checked');
               jQuery('#datatable').addDataTable({ "bProcessing": true });
               jQuery('.datatable_variable').click(function () {
-                  var url = '/job_system/<%= @params_name.to_s + 's' %>';
+                  var url = '<%= @params_name.to_s + 's' %>';
                   jQuery.ajax({
                       url:url,
                       type:'GET',

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

@@ -239,10 +239,7 @@
 
     function setLogicalType(){
       logical_type = '::Logical::Naf::LogParser::';
-      if('<%= record_type %>' == 'machine'){
-        logical_type += 'Machine';
-      }
-      else if('<%= record_type %>' == 'runner'){
+      if('<%= record_type %>' == 'runner'){
         logical_type += 'Runner';
       }
       else if('<%= record_type %>' == 'job'){

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

@@ -29,7 +29,9 @@
       if (!answer) {
         return false;
       }
-      var url = '/job_system/machine_runner_invocations/';
+      var str = window.location.pathname;
+      var sub_path = str.substring(0, str.indexOf("job_system"));
+      var url = sub_path + 'job_system/machine_runner_invocations/';
       jQuery.ajax({
         url: url,
         type: 'POST',

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

@@ -103,8 +103,9 @@
         return false;
       }
       var id = <%= @machine_runner.machine_runner_invocations.last.id %>;
-      var url = '/job_system/machine_runner_invocations/' + id;
-      jQuery.ajax({
+      var str = window.location.pathname;
+      var sub_path = str.substring(0, str.indexOf("job_system"));
+      var url = sub_path + 'job_system/machine_runner_invocations/' + id;      jQuery.ajax({
         url: url,
         type: 'POST',
         dataType: 'json',

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

@@ -1,15 +1,6 @@
  <%
   rows = @machines.each do |machine|
-    machine[11] = link_to image_tag('machine.png',
-                                    class: 'action',
-                                    title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) log"),
-                                    url_for({ controller: 'log_viewer',
-                                              action: 'index',
-                                              record_id: machine[0],
-                                              record_type: 'machine' }),
-                                    { target: '_blank', id: machine[0] }
-    machine[11] << "&nbsp;&nbsp;".html_safe
-    machine[11] << (link_to image_tag('machine_runner.png',
+    machine[11] = (link_to image_tag('machine_runner.png',
                                       class: 'action',
                                       title: "View machine(id: #{machine[0]}, server:#{machine[1].blank? ? machine[2] : machine[1]}) runner log"),
                                       url_for({ controller: 'log_viewer',

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

@@ -54,18 +54,10 @@
       </tbody>
     </table>
     </br>
-    <%= render partial: 'naf/log_viewer/log_layout', locals: { record_id: @machine.id, record_type: 'machine' } %>
   </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: {
-             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@machine).runner}#{naf.logs_log_parsers_path}",
-             record_id: @machine.id,
-             record_type: 'machine'
-           } %>
 
 <% content_for :javascripts do %>
   <script type='text/javascript'>
@@ -76,9 +68,8 @@
                   return false;
               }
               var id = <%= @machine.id %>;
-              var url = '/job_system/machines/' + id;
               jQuery.ajax({
-                  url: url,
+                  url: id,
                   type: 'POST',
                   dataType: 'json',
                   data: { "machine[marked_down]": 1, "terminate": true, "_method": "put" },

data/app/views/naf/shared/_select_per_page.html.erb

@@ -60,7 +60,7 @@
 
     function updateRunnerCount() {
       jQuery.ajax({
-        url: '/job_system/machine_runners/runner_count',
+        url: 'job_system/machine_runners/runner_count',
         type: 'GET',
         dataType: 'json',
         success:function (data) {
@@ -73,7 +73,7 @@
 
     function updateLastCheckedScheduleAt() {
       jQuery.ajax({
-        url: '/job_system/machines/last_checked_schedule_at',
+        url: 'job_system/machines/last_checked_schedule_at',
         type: 'GET',
         dataType: 'json',
         success:function (data) {

data/ci/travis.sh

@@ -12,15 +12,23 @@ then
   cp config/database-non_primary.yml config/database.yml
   cp app/models/other/base.rb.sample app/models/other/base.rb
   cp config/initializers/naf.rb.non_primary config/initializers/naf.rb
-  $rake naf:install:migrations naf:isolate:migrations db:create:all naf:db:migrate naf:janitor:infrastructure naf:db:test:clone_structure
+  $rake naf:install:migrations
+  $rake naf:isolate:migrations
+  $rake db:create:all
+  $rake naf:db:migrate
+  $rake naf:janitor:infrastructure
+  $rake naf:db:test:clone_structure
 else
   echo 'Testing primary database install'
   cp config/database-primary.yml config/database.yml
   cp config/initializers/naf.rb.primary config/initializers/naf.rb
-  $rake naf:install:migrations db:create db:migrate naf:janitor:infrastructure db:test:clone_structure
+  $rake naf:install:migrations
+  $rake db:create
+  $rake db:migrate
+  $rake naf:janitor:infrastructure
+  $rake db:test:clone_structure
 fi
 
 cd ../..
 
 $rake spec
-

data/lib/naf/version.rb

@@ -1,3 +1,3 @@
 module Naf
-  VERSION = '2.1.9'
+  VERSION = '2.1.10'
 end

data/naf.gemspec

@@ -5,29 +5,29 @@ require "naf/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "naf"
+  s.name        = 'naf'
   s.version     = Naf::VERSION
   s.license     = 'New BSD License'
-  s.date        = '2014-03-25'
-  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"
-  s.authors     = ["Keith Gabryelski", "Leonardo Meira"]
+  s.date        = '2014-04-15'
+  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'
+  s.authors     = ['Keith Gabryelski', 'Leonardo Meira']
   s.email       = ['keith@fiksu.com', 'lmeira@fiksu.com']
   s.files       = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.homepage    = 'http://github.com/fiksu/naf'
 
-  s.add_dependency "rails", ">= 3.2"
-  s.add_dependency "partitioned"
-  s.add_dependency "log4r_remote_syslog_outputter", ">= 0.0.1"
-  s.add_dependency "jquery-rails"
+  s.add_dependency 'rails', '>= 3.2'
+  s.add_dependency 'partitioned'
+  s.add_dependency 'log4r_remote_syslog_outputter', '>= 0.0.1'
+  s.add_dependency 'jquery-rails'
   s.add_dependency 'will_paginate'
-  s.add_dependency 'facter'
-  s.add_development_dependency "pg"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "factory_girl_rails", "~> 4.0.0"
+  s.add_dependency 'facter', '~> 1.7.5'
+  s.add_development_dependency 'pg'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'factory_girl_rails', '~> 4.0.0'
   s.add_development_dependency 'awesome_print'
 
-  s.executables   = ["naf"]
+  s.executables   = ['naf']
 end

data/spec/models/naf/machine_spec.rb

@@ -119,6 +119,19 @@ module Naf
       end
     end
 
+    context "when updating the machine" do
+      it "should not save when enabled and deleted are true" do
+        bad_machine = FactoryGirl.build(:machine, enabled: true, deleted: true)
+        bad_machine.save.should_not be_true
+        bad_machine.errors.messages[:enabled].should_not be_nil
+      end
+
+      it "should save when enabled is true and deleted is false" do
+        machine = FactoryGirl.build(:machine, enabled: true, deleted: false)
+        machine.save.should be_true
+      end
+    end
+
     #----------------------
     # *** Class Methods ***
     #++++++++++++++++++++++
@@ -126,7 +139,7 @@ module Naf
     describe "#enabled" do
       before do
         machine.update_attributes!(enabled: true)
-        FactoryGirl.create(:machine_two, enabled: false)
+        FactoryGirl.create(:machine_two, enabled: false, deleted: true)
       end
 
       it "return the correct machine" do

data/spec/models/process/naf/runner_spec.rb

@@ -1,10 +1,25 @@
 require 'spec_helper'
 
 module Process::Naf
-
   describe Runner do
+    let!(:runner) { ::Process::Naf::Runner.new }
+
+    describe '#memory_available_to_spawn?' do
+      before do
+        Facter.should_receive(:memorysize_mb).and_return(100.0)
+        runner.instance_variable_set(:@minimum_memory_free, 15.0)
+      end
 
+      it 'return true when there is available memory' do
+        Facter.should_receive(:memoryfree_mb).and_return(20.0)
+        runner.memory_available_to_spawn?.should be_true
+      end
 
+      it 'return true when there is available memory' do
+        Facter.should_receive(:memoryfree_mb).and_return(10.0)
+        runner.memory_available_to_spawn?.should be_false
+      end
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naf
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,17 +97,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +278,6 @@ files:
 - app/models/logical/naf/log_file.rb
 - app/models/logical/naf/log_parser/base.rb
 - app/models/logical/naf/log_parser/job.rb
-- app/models/logical/naf/log_parser/machine.rb
 - app/models/logical/naf/log_parser/runner.rb
 - app/models/logical/naf/log_reader.rb
 - app/models/logical/naf/machine.rb
@@ -371,7 +370,6 @@ files:
 - app/views/naf/log_viewer/_job_logs.html.erb
 - app/views/naf/log_viewer/_log_display.html.erb
 - app/views/naf/log_viewer/_log_layout.html.erb
-- app/views/naf/log_viewer/_machine_logs.html.erb
 - app/views/naf/log_viewer/_runner_logs.html.erb
 - app/views/naf/log_viewer/_search_options.html.erb
 - app/views/naf/log_viewer/_update_page_title.html.erb

data/app/models/logical/naf/log_parser/machine.rb

@@ -1,64 +0,0 @@
-require 'yajl'
-
-module Logical::Naf
-  module LogParser
-    class Machine < Base
-
-      def initialize(params)
-        super(params)
-      end
-
-      def logs
-        retrieve_logs
-      end
-
-      private
-
-      def insert_log_line(elem)
-        "&nbsp;&nbsp;<span>#{elem['output_time']} <font color='333399'><b>jid(#{elem['job_id']}):</b></font> #{elem['message']}</br></span>"
-      end
-
-      def sort_jsons
-        # Sort log lines based on timestamp
-        @jsons = jsons.sort { |x, y| Time.parse(x['output_time']) <=> Time.parse(y['output_time']) }
-      end
-
-      def parse_newest_log
-        if newest_log.scan(/jid\(\d*\)\: /).present?
-          newest_log.slice!(/jid\(\d*\)\: /)
-        end
-        newest_log
-      end
-
-      def retrieve_log_files_from_s3
-        s3_log_reader.log_files
-      end
-
-      def get_files
-        if log_type == 'old' && read_from_s3 == 'true'
-          get_s3_files do
-            @s3_log_reader = ::Logical::Naf::LogReader.new
-            return retrieve_log_files_from_s3
-          end
-        else
-          files = Dir["#{::Naf::PREFIX_PATH}/#{::Naf.schema_name}/jobs/*/*"]
-          if files.present?
-            # Sort log files based on time
-            return files.sort { |x, y| Time.parse(y.scan(DATE_REGEX)[0][0]) <=> Time.parse(x.scan(DATE_REGEX)[0][0]) }
-          else
-            get_s3_files do
-              @read_from_s3 = 'true'
-              @s3_log_reader = ::Logical::Naf::LogReader.new
-              return retrieve_log_files_from_s3
-            end
-          end
-        end
-      end
-
-      def get_job_id(file)
-        file.scan(/\d+_\d{8}/).first.split('_').first
-      end
-
-    end
-  end
-end

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

@@ -1,62 +0,0 @@
-<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%">Machine Information</strong>
-                  <table id='naf_table_show' style="margin-left: 10%; width: 75%">
-                    <thead>
-                      <tr>
-                        <td width="7%">ID</td>
-                        <td>Server</td>
-                        <td>Last Seen Alive At</td>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr>
-                        <td><%= @machine.id %></td>
-                        <td><%= @machine.hostname %></td>
-                        <td><%= @machine.last_seen_alive_at %></td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-            </br>
-
-            <%= submit_tag("Search the logs", id: 'log_search_submit') %>
-            &nbsp;&nbsp;&nbsp;
-            <%= link_to 'Back to Machine', { controller: 'machines', action: 'show', id: @machine.id } %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<%= render partial: 'update_page_title', locals: { title: "Machine(#{@machine.id}) Logs" } %>
-<%= render partial: 'naf/shared/auto_resize_width', locals: { div_class: '.scrollable-output-expanded' } %>
-<%= render partial: 'log_display',
-           locals: {
-             logs_url: "#{http_protocol}#{::Logical::Naf::Machine.new(@machine).runner}#{naf.logs_log_parsers_path}",
-             record_id: @machine.id,
-             record_type: 'machine'
-           } %>