batch_manager 0.2.6 → 0.2.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGRhOWQ1ZmJhMmU4Nzg3NzJhMmExMWM3ZTZhOWRmYjM0YmFkZTU4NA==
+    M2M2ODYwMWZjOWY0NjQyZTZiN2ExYjk2MTAyYzk3MzVkZTc4Mzk0Mw==
   data.tar.gz: !binary |-
-    Y2U4MGYxY2MwYTI4OGMzNmJiNjJmZTE5Yjg5YjZjOWQzNDcwNjZjZQ==
+    MjliZTg3YzE4Mzk5ZjZkZjgxY2U3MmE4MDBkNzhiYmM1Y2QzYmI5Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2YyMDgyNWE3MmYzYTYxMzg3ZTA1Y2Y2NDRhN2M5MjNmMmE4YTE2YWVhYThi
-    OTI1MDVhNzc0OGNlNDk5OTA3MDBlZWJmOTgwNTllYjI3MDVkYjI4NzZhNjRl
-    OTBmZjc1YWIzMThiNGM0ZWMyNWZlYWNhYTk0ZDQxOWI2YWM3MWI=
+    ODZkMzU2MDQ1NWM0NWZjZTljOGRiM2M0NWVlMDc1ZWNhMDQzNDViZWM5NWJl
+    ZjE3YzkxMzE5ZDE2NjYxZWQxNWI4MWE3NGZkMDNjNGI4NDg0MjhhZTJiMzIw
+    YjE2YWRkMGYwNzIxMTFiNjlkNDc4NTBlZWM4ZGM3OTlmMjQ5N2Y=
   data.tar.gz: !binary |-
-    MTYzNzhhNWM1ZWE2NTk0MDAwYjk2M2NjZDk2ZTFlMjJjODQ3ZmI3ZTdjNjRm
-    ZGRhNzEwMWVkODFhZmQzMWM1Y2U0NzRhZjE2ZTEzZDY1MjgxZGIyNDIxZjdl
-    YzViOWUzN2U2Y2U5MDJmNTZlZDI0MDlhNGFmNTc0MjkxM2E5MmY=
+    YzI1YWYwMWFmZjEwOThkNDFjODYxOTIwMGMwN2Q2NzMxM2MyN2I5YmExYzZl
+    OGFlYjc4NTg4NDY5NDE0OTk5ZjdjNTJkZWFmZWMwNjg2MDg0NWQ1OTZlMjhi
+    NjJlOTgyMjk0YTM4NmFhMmUzZmQ5NjllMTcxYjUyMmY5NGUyZTc=

data/app/controllers/batch_manager/batches_controller.rb

@@ -1,15 +1,15 @@
 module BatchManager
   class BatchesController < ApplicationController
+    before_filter :retain_batch_params, :except => [:index]
+
     def index
       @details = BatchManager::Monitor.details
     end
 
     def exec
-      @batch_name = params[:batch_name]
-      @wet = params[:wet]
       if resque_supported?
         Resque.enqueue(BatchManager::ExecBatchWorker, @batch_name, :wet => @wet)
-        @offset = log_file.size
+        redirect_to(log_batches_url(:batch_name => @batch_name, :wet => @wet))
       else
         BatchManager::Executor.exec(@batch_name, :wet => @wet)
         redirect_to(batches_url)
@@ -17,18 +17,22 @@ module BatchManager
     end
 
     def async_read_log
-      file = log_file
-      file.seek(params[:offset].to_i) if params[:offset].present?
-      render :json => {:content => file.read, :offset => file.size}
+      log_file.seek(params[:offset].to_i) if params[:offset].present?
+      render :json => {:content => log_file.read, :offset => log_file.size}
     end
 
     def log
-      log_file = BatchManager::Logger.log_file_path(params[:batch_name], params[:wet])
-      render :file => log_file, :content_type => Mime::TEXT, :layout => false
+      @offset = log_file.size
+      @content = log_file.read
     end
 
     private
 
+    def retain_batch_params
+      @batch_name = params[:batch_name]
+      @wet = params[:wet]
+    end
+
     def resque_supported?
       begin
         require 'resque'
@@ -39,7 +43,15 @@ module BatchManager
     end
 
     def log_file
-      File.open(BatchManager::Logger.log_file_path(params[:batch_name], params[:wet]), 'r')
+      20.times do
+        begin
+          @log_file ||= File.open(BatchManager::Logger.log_file_path(@batch_name, @wet), 'r')
+          return @log_file
+        rescue
+          sleep 3
+          retry
+        end
+      end
     end
   end
 end

data/app/views/batch_manager/batches/{exec.html.erb → log.html.erb}

@@ -16,7 +16,7 @@
   });
 </script>
 
-<h2><%= @batch_name %> <%= "WET RUN" if @wet %> Executing!<h2>
+<h2><%= @batch_name %><h2>
 
-<%= text_area_tag :log, nil, :id => "log_box" %>
+<%= text_area_tag :log, @content, :id => "log_box" %>
 <%= hidden_field_tag :offset, @offset, :id => :offset %>

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Weihu Chen
@@ -122,8 +122,8 @@ files:
 - app/assets/stylesheets/batch_manager/batches.css
 - app/controllers/batch_manager/application_controller.rb
 - app/controllers/batch_manager/batches_controller.rb
-- app/views/batch_manager/batches/exec.html.erb
 - app/views/batch_manager/batches/index.html.erb
+- app/views/batch_manager/batches/log.html.erb
 - app/views/layouts/batch_manager/application.html.erb
 - app/workers/batch_manager/exec_batch_worker.rb
 - config/routes.rb