bricolage 5.18.1 → 5.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d53e1ef12fa46e40f582c88a0c6e7160e9f5289
-  data.tar.gz: fdf237fc9cf155993e97e3fd49e056caf61caa1b
+  metadata.gz: 4e09f9be942c6431360ac3ec8afbd9cae5c03b06
+  data.tar.gz: b9c2dc9c5a91b42b0e60fb43c089b12f58670128
 SHA512:
-  metadata.gz: 63bd4a335142ce2ff1d0aef8cf96999367919afea579655556654e6ffd22aa09554f613b5212e3ef066fcd68add40f8c39ff5e1aa2a9cf6a90f6038123fba100
-  data.tar.gz: b2efecf9474c6ffc6d2809aa523cfd7a2df1ca4c303116eb5d9c540fe3c2b1f0ba9e45b6834313d6067b2506d734d362706592d80109ea50f94b3933b30ed107
+  metadata.gz: be674ea50692704964d7360c35092e116078b5fb03ac0d2e2f620eb9abb083ffbc9a335d384e4f1c5a68594da4ff00e528097f707da6e03a2925e20a015fe7b5
+  data.tar.gz: 69241018dcfa1862b327bcc9d43404890b91bc38bcd57836b5a34187507318a3ba9907de33534fef15c606bc01a08e5f4cd6d70ba2c0e0215d9614f5005af7fb

data/lib/bricolage/application.rb

@@ -5,6 +5,7 @@ require 'bricolage/jobresult'
 require 'bricolage/variables'
 require 'bricolage/datasource'
 require 'bricolage/eventhandlers'
+require 'bricolage/postgresconnection'
 require 'bricolage/logger'
 require 'bricolage/exception'
 require 'bricolage/version'
@@ -14,12 +15,17 @@ require 'optparse'
 module Bricolage
 
   class Application
+    def Application.install_signal_handlers
+      Signal.trap('PIPE', 'IGNORE')
+      PostgresConnection.install_signal_handlers
+    end
+
     def Application.main
+      install_signal_handlers
       new.main
     end
 
     def initialize
-      Signal.trap('PIPE', 'IGNORE')
       @hooks = Bricolage
     end
 

data/lib/bricolage/commandlineapplication.rb

@@ -1,9 +1,11 @@
+require 'bricolage/application'
 require 'bricolage/context'
 require 'forwardable'
 
 module Bricolage
   class CommandLineApplication
     def CommandLineApplication.define
+      Application.install_signal_handlers
       opts = new
       yield opts
       opts.parse!

data/lib/bricolage/jobnetrunner.rb

@@ -17,11 +17,11 @@ module Bricolage
 
   class JobNetRunner
     def JobNetRunner.main
+      Application.install_signal_handlers
       new.main
     end
 
     def initialize
-      Signal.trap('PIPE', 'IGNORE')
       @hooks = ::Bricolage
       @jobnet_id = nil
       @jobnet_start_time = Time.now

data/lib/bricolage/postgresconnection.rb

@@ -7,6 +7,13 @@ module Bricolage
 
   class PostgresConnection
 
+    def PostgresConnection.install_signal_handlers
+      Signal.trap(:TERM) {
+        $stderr.puts 'receive SIGTERM'
+        raise Interrupt, 'SIGTERM'
+      }
+    end
+
     def PostgresConnection.open_data_source(ds)
       conn = _open_ds(ds)
       if block_given?
@@ -54,19 +61,46 @@ module Bricolage
       @closed
     end
 
+    def cancel_force
+      cancel
+    rescue PostgreSQLException
+    end
+
+    def cancel
+      @logger.info "cancelling PostgreSQL query..."
+      err = @connection.cancel
+      if err
+        @logger.error "could not cancel query: #{err}"
+        raise PostgreSQLException, "could not cancel query: #{err}"
+      else
+        @logger.info "successfully cancelled"
+      end
+    end
+
+    def querying
+      return yield
+    rescue Interrupt
+      @logger.info "query interrupted"
+      cancel_force
+      raise
+    end
+    private :querying
+
     def execute_update(query)
       log_query query
       rs = log_elapsed_time {
-        @connection.exec(query)
+        querying {
+          @connection.async_exec(query)
+        }
       }
-      result = rs.to_a
-      rs.clear
-      result
+      return rs.to_a
     rescue PG::ConnectionBad, PG::UnableToSend => ex
       @connection_failed = true
       raise ConnectionError.wrap(ex)
     rescue PG::Error => ex
       raise PostgreSQLException.wrap(ex)
+    ensure
+      rs.clear if rs
     end
 
     alias execute execute_update
@@ -89,19 +123,25 @@ module Bricolage
       execute_query(query) {|rs| rs.to_a.first }
     end
 
+    def query_rows(query)
+      execute_query(query) {|rs| rs.to_a }
+    end
+
     def execute_query(query, &block)
       log_query query
       rs = log_elapsed_time {
-        @connection.exec(query)
+        querying {
+          @connection.async_exec(query)
+        }
       }
-      result = yield rs
-      rs.clear
-      result
+      return (yield rs)
     rescue PG::ConnectionBad, PG::UnableToSend => ex
       @connection_failed = true
       raise ConnectionError.wrap(ex)
     rescue PG::Error => ex
       raise PostgreSQLException.wrap(ex)
+    ensure
+      rs.clear if rs
     end
 
     alias query execute_query
@@ -112,27 +152,6 @@ module Bricolage
       }
     end
 
-    def streaming_execute_query(query, &block)
-      log_query query
-      log_elapsed_time {
-        @connection.send_query(query)
-      }
-      @connection.set_single_row_mode
-      while rs = @connection.get_result
-        begin
-          rs.check
-          yield rs
-        ensure
-          rs.clear
-        end
-      end
-    rescue PG::ConnectionBad, PG::UnableToSend => ex
-      @connection_failed = true
-      raise ConnectionError.wrap(ex)
-    rescue PG::Error => ex
-      raise PostgreSQLException.wrap(ex)
-    end
-
     def in_transaction?
       @connection.transaction_status == PG::Constants::PQTRANS_INTRANS
     end

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.18.1'
+  VERSION = '5.19.0'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.18.1)
+    bricolage (5.19.0)
       aws-sdk (~> 2)
       mysql2
       pg (~> 0.18.0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.18.1
+  version: 5.19.0
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg