pipeline_toolkit 1.2.15 → 1.2.16

data/lib/pipeline_toolkit/amqp/abstract.rb

@@ -43,6 +43,11 @@ module PipelineToolkit
       def initialize_connection
         DefaultLogger.debug("Amqp::Abstract#initialize_connection") if options[:env] == "development"
         @connection = AMQP.connect(options.select_keys(:host, :port, :user, :pass, :vhost))
+
+        # Override Signals, so that connection is shutdown gracefully
+        Signal.trap('INT')  { @connection.close; EM.stop }
+        Signal.trap('TERM') { @connection.close; EM.stop }
+        Signal.trap('PIPE') { @connection.close; EM.stop }
       end
     
       ##

data/lib/pipeline_toolkit/cli/msg_generator_cli.rb

@@ -1,18 +1,6 @@
 require 'trollop'
 require 'eventmachine'
 require 'pipeline_toolkit'
-
-Signal.trap('INT') do
-  puts "\nStopping"
-  exit(0)
-  # TODO: complete signal trap interrupt
-end
-
-Signal.trap('TERM') do
-  puts "\nStopping"
-  exit(0)
-  # TODO: complete signal trap terminate
-end
        
 module PipelineToolkit # :nodoc:
   module CLI

data/lib/pipeline_toolkit/handlers/message_handler.rb

@@ -40,6 +40,7 @@ module PipelineToolkit
             
       rescue StandardError => e # rescued here because main thread does not seem to see it
         DefaultLogger.error("#{e.class.name}: #{e.message}\n" << e.backtrace.join("\n"))
+        raise e
       end
 
       def receive_line(message_coded)

data/lib/pipeline_toolkit/message_command.rb

@@ -63,6 +63,7 @@ module PipelineToolkit
 
       Signal.trap('INT')  { EM.stop }
       Signal.trap('TERM') { EM.stop }
+      Signal.trap('PIPE') { EM.stop }
 
       begin
         EM.run do

data/lib/pipeline_toolkit/message_generator.rb

@@ -11,6 +11,11 @@ module PipelineToolkit
     end
   
     def start
+
+      Signal.trap('INT')  { puts "Stopping"; exit(0) }
+      Signal.trap('TERM') { puts "Stopping"; exit(0) }
+      Signal.trap('PIPE') { raise "Stopping, lost pipe" }
+
       @count = 0
       loop do
         @count += 1

data/lib/pipeline_toolkit/message_subscriber.rb

@@ -50,9 +50,6 @@ module PipelineToolkit
     #
     def start
 
-      Signal.trap('INT') { EM.stop  }
-      Signal.trap('TERM') { EM.stop  }
-
       DefaultLogger.debug("MessageSubscriber#start")
       begin
         create_sys_pipe

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 15
-  version: 1.2.15
+  - 16
+  version: 1.2.16
 platform: ruby
 authors: 
 - Aisha Fenton