batch_manager 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg5MzM1MGQzMTFhNDJlM2YzZDljODRmNjQ0NzQyODJkZDI1YTU4Mg==
+    NzcyOGI4YjBhYTFjZmFjNGJhMWZiYTc4M2EyYmRiMjNmYjk0NTM1ZQ==
   data.tar.gz: !binary |-
-    MzViMWU3NTE1OGNjNDU2MzcxMDA0M2U0ZWI1ZmE3ZDY3ZDkzZjcwZA==
+    MDZlMDJjZjNiMDgwOTA2ZjYxMWQxM2NiOTM0NWI5ZmUyODZjZTNiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzQ0NDcyOTQyYTNmNmMyZTUyMTc5NjE0YTA0YjQ1ZTg5N2VkMWVjOTYyZjIy
-    NjhhN2U3ODZhMzZlNGQ0MzkwNmUyMjc0NmU1MzhjNjU1YTYwZDRmNWUxODhm
-    ZGFhMmE4NThjMzQxYTdkZjE3MDAwMDQ2NjIxNDc0YjdmOTY1Nzk=
+    MGQ3Y2I4NDA4NmVjYWVhNTJiMGQ2MjJkYWM1Y2IzNmU3Y2ZiNDQyZjkyNmFh
+    OWE0ZjNkNDMyMjQzNjQ4NTdiMDkyNjYwOTE1YWFkMjE1YWEyZDNlNGFiZWY2
+    MDcwYTNjZDg1YmZlYjAyYjg4MDllZjQzMzMxNzc3ODkwOTk3NDM=
   data.tar.gz: !binary |-
-    Mjc4ZTVmYTUzMGE3ZDhiMTQ3NDJhMmM1MjExMWRiZjI0ZDc0YmMxMGE3Yjdj
-    ODA4ODRkNGE3YjI4ZmJhYTg5M2EyMWFjNGM4NDk4MzJmMThiY2ZlYTZkMDA5
-    NjlkNjQ1NTQ1OWI0ZGNiYThiM2MyN2U1NTAyZjBlOTIyNzExNWE=
+    NGQxZmFhNjIzYjFhZWM5OGY4YmYyNDc1ZDk5NjI3ZDg2YjhlYzE3ZDk4MzBk
+    MjFkN2RmYTczNTJmZGNhZGFkZTAxODQ3MGNhOTY0MzAyYzQ4MGZiMTRhNDNl
+    Zjc0ZDI0NjcyZTczMWFhNDVmMDliYTU4NWIxMDdkZjI1YmFjMjQ=

data/app/controllers/batch_manager/application_controller.rb

@@ -1,19 +1,36 @@
+require 'socket'
+
 module BatchManager
   class ApplicationController < ActionController::Base
+    helper_method :resque_supported?, :local_resque_worker?, :resque_worker_hostname
+
     def resque_supported?
       begin
         require 'resque'
-        if defined?(Resque)
-          queue_names = []
-          Resque.workers.map do |worker|
-            queue_names += worker.id.split(':')[-1].split(',')
-          end
-          return true if queue_names.include?(BatchManager::ExecBatchWorker.queue_name) || queue_names.include?("*")
-        end
-        false
+        defined?(Resque) && resque_worker
       rescue
         false
       end
     end
+
+    def local_resque_worker?
+      Socket.gethostname == resque_worker_hostname
+    end
+
+    def resque_worker_hostname
+      resque_worker.id.split(':')[0]
+    end
+
+    private
+
+    def resque_worker
+      @resque_worker ||= begin
+        workers = Resque.workers.select do |worker|
+          queue_names = worker.id.split(':')[-1].split(',')
+          queue_names.include?(BatchManager::ExecBatchWorker.queue_name) || queue_names.include?("*")
+        end
+        workers.first
+      end
+    end
   end
 end

data/app/controllers/batch_manager/batches_controller.rb

@@ -7,7 +7,6 @@ module BatchManager
     helper_method :escape_batch_name
 
     def index
-      @resque_supported = resque_supported?
       @details = BatchManager::Monitor.details
     end
 
@@ -41,7 +40,11 @@ module BatchManager
     def exec
       if resque_supported?
         Resque.enqueue(BatchManager::ExecBatchWorker, @batch_name, :wet => @wet)
-        redirect_to(log_batches_url(:batch_name => @batch_name, :wet => @wet, :refresh => true))
+        if local_resque_worker?
+          redirect_to(log_batch_url(:batch_name => @batch_name, :wet => @wet, :refresh => true))
+        else
+          redirect_to(batches_url, :notice => "(#{@batch_name}) Task added to the remote resque worker.")
+        end
       else
         BatchManager::Executor.exec(@batch_name, :wet => @wet)
         redirect_to(batches_url)
@@ -79,7 +82,7 @@ module BatchManager
     end
 
     def log_file
-      20.times do
+      5.times do
         begin
           @log_file ||= File.open(BatchManager::Logger.log_file_path(@batch_name, @wet), 'r')
           return @log_file

data/app/views/batch_manager/batches/index.html.erb

@@ -1,8 +1,12 @@
 <div class="group title">
   <h2 style="float:left;">Batches</h2>
   <div style="float:right;text-align:right;">
-    <% if @resque_supported %>
-      <div class="label info">Resque worker found</div>
+    <% if resque_supported? %>
+      <% if local_resque_worker? %>
+        <div class="label info">Resque worker found</div>
+      <% else %>
+        <div class="label info">Resque worker found on <%= resque_worker_hostname %></div>
+      <% end %>
     <% else %>
       <div class="label warn">Resque or Resque worker not found</div>
     <% end %>

data/app/views/batch_manager/batches/log.html.erb

@@ -2,7 +2,7 @@
 <script>
   function read_log() {
     offset = $("#offset").val();
-    $.get('<%= async_read_log_batch_url(escape_batch_name(@batch_name), :wet => @wet) %>' + '&offset=' + offset, function(data) {
+    $.get('<%= async_read_log_batch_url(escape_batch_name(@batch_name), :wet => @wet, 1 => 1) %>' + '&offset=' + offset, function(data) {
       $("#log_box").val($("#log_box").val() + data.content);
       $("#offset").val(data.offset);
       scrollLogBoxDown();

data/lib/batch_manager/executor.rb

@@ -4,11 +4,12 @@ module BatchManager
 
     class << self
       def exec(batch_file, options = {})
-        batch_file_path = batch_full_path(batch_file)
-        if File.exist?(batch_file_path)
-          batch_status = BatchManager::BatchStatus.new(batch_file_path)
-          if options[:force] || !options[:wet] || batch_status.can_run?
-            exec_batch_script(batch_file_path, batch_status, options[:wet])
+        @batch_file_path = batch_full_path(batch_file)
+        if File.exist?(@batch_file_path)
+          @batch_status = BatchManager::BatchStatus.new(@batch_file_path)
+          @wet = options[:wet]
+          if options[:force] || !@wet || @batch_status.can_run?
+            record_run_duration { exec_batch_script }
           else
             raise "Cannot run this batch."
           end
@@ -19,31 +20,32 @@ module BatchManager
 
       protected
 
-      def exec_batch_script(batch_file_path, batch_status, is_wet)
-        logger = BatchManager::Logger.new(batch_status.name, is_wet)
-        write_log_header(is_wet)
+      def record_run_duration
+        @logger = BatchManager::Logger.new(@batch_status.name, @wet)
         start_at = Time.now
-        begin
-          @wet = is_wet
-          eval(File.read(batch_file_path))
-          end_at = Time.now
-          logger.info "Completed at: #{end_at.strftime("%Y-%m-%d %H:%M:%S")} (#{(end_at - start_at).to_i}s)"
-          batch_status.update_schema if is_wet
-        rescue => e
-          logger.error e
-          end_at = Time.now
-          logger.info "Failed at: #{end_at.strftime("%Y-%m-%d %H:%M:%S")} (#{(end_at - start_at).to_i}s)"
-        ensure
-          puts "Log saved at: #{BatchManager.logger.log_file}" if logger.log_file
-          logger.close
-        end
+        yield
+        end_at = Time.now
+        @logger.info "End at: #{end_at.strftime("%Y-%m-%d %H:%M:%S")} (#{(end_at - start_at).to_i}s)"
+        @logger.close
+      end
+
+      def exec_batch_script
+        write_log_header
+        eval(File.read(@batch_file_path))
+        @logger.info "Succeeded."
+        @batch_status.update_schema if @wet
+      rescue => e
+        @logger.error e
+        @logger.info "Failed."
+      ensure
+        puts "Log saved at: #{@logger.log_file}" if @logger.log_file
       end
 
-      def write_log_header(is_wet)
-        BatchManager.logger.info "=============================="
-        BatchManager.logger.info "= #{is_wet ? 'WET' : 'DRY'} RUN"
-        BatchManager.logger.info "= Ran at: #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
-        BatchManager.logger.info "=============================="
+      def write_log_header
+        @logger.info "=============================="
+        @logger.info "= #{@wet ? 'WET' : 'DRY'} RUN"
+        @logger.info "= Ran at: #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
+        @logger.info "=============================="
       end
     end
   end

data/lib/batch_manager/version.rb

@@ -1,3 +1,3 @@
 module BatchManager
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Weihu Chen