dmexe-thrifty 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02bb1afbf7a8fd33c10b8a8f0fa7a3b48ddf884a
-  data.tar.gz: d3280242048e29b3648fac63751251dfde9f0181
+  metadata.gz: fa08531660b09078cd5a18d94337dfde405914de
+  data.tar.gz: 439df8156f3d1f8ff52d7819b93a9153ef20f3d3
 SHA512:
-  metadata.gz: 156e21274643c268bc42f4d226f466e7635a5f0b3aad3fd0735cd222f81e28b95f8370b0633ff2418919b6ba6f6016383d73ba788aae558d8e15cf8d23b455a7
-  data.tar.gz: 0fd456ab3cf539ae3ccdcffff4bc7b756144c183181d099b74c43d028da1d5b05c6b238d1f3046233dc5f625ca0c6c327062e9845b281b75867dd232ed1d3b95
+  metadata.gz: 4469b31c70a71b98c0027b5df2a65faef492c500f220b3f789c8837f461ada1d098ac8fdffe3ca39cc7fa0300668cb9984f6d42739783d9c1014bad74826bdad
+  data.tar.gz: c42ae1a28b8bb5c6ecd43b8cd31051a033204a45cfad3e1fdf21af207e9eb6f85df2ccee7347a17f5619cfbbeae4332248fc808dda6fb4b6f02451033416a745

data/lib/thrifty/http_server/log_middleware.rb

@@ -24,12 +24,12 @@ module Thrifty::HTTP::Server
       peer   = env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"]
 
       payload = {
-        peer: peer,
-        status:   status.to_s[0..3],
         method:   env[Rack::REQUEST_METHOD],
         path:     env[Rack::PATH_INFO],
         query:    env[Rack::QUERY_STRING],
+        status:   status.to_s[0..3],
         len:      length,
+        peer:     peer,
         duration: now - began_at
       }
 

data/lib/thrifty/http_server/puma_server.rb

@@ -15,7 +15,7 @@ module Thrifty::HTTP::Server
       ip    = options[:ip]   || DEFAULT_IP
       min   = options[:min]  || DEFAULT_MIN_TH
       max   = options[:max]  || DEFAULT_MAX_TH
-      name  = options[:name] || 'Puma'
+      name  = options[:name] || "Thrifty::HTTP::Server"
 
       @log  = Thrifty.get_logger(name)
       @bind = "#{ip}:#{port}"

data/lib/thrifty/hutch/builder.rb

@@ -5,7 +5,8 @@ module Thrifty::Hutch
     def initialize
       require 'hutch'
 
-      @url = ENV['RABBITMQ_URL'] || 'amqp://guest:guest@localhost:5672/'
+      @url      = ENV['RABBITMQ_URL'] || 'amqp://guest:guest@localhost:5672/'
+      @exchange = 'hutch'
 
       @lock = Mutex.new
 
@@ -19,6 +20,11 @@ module Thrifty::Hutch
       self
     end
 
+    def with_exchange(name)
+      ::Hutch::Config.set(:mq_exchange, name)
+      self
+    end
+
     def build
       ::Hutch::Logging.logger = Thrifty.get_logger "Hutch"
       ::Hutch::Config.set(:uri,                 @url)
@@ -30,8 +36,10 @@ module Thrifty::Hutch
     def stop
       @lock.synchronize do
         if @worker
+          ::Hutch::Logging.logger.info "stopping"
           @worker.stop
           ::Hutch.disconnect
+          ::Hutch::Logging.logger.info "stopped"
           @worker = nil
         end
       end

data/lib/thrifty/logger/app.rb

@@ -10,7 +10,7 @@ module Thrifty::Logger
       @queue = Queue.new
       @lock  = Mutex.new
 
-      Thrifty::Signals.register(method(:stop))
+      Thrifty::Signals.register_after(method(:stop))
     end
 
     def start
@@ -28,9 +28,11 @@ module Thrifty::Logger
     def stop
       @lock.synchronize do
         return unless @thread
-        @queue.push :shutdown
+        append(new_entry("stopping"))
+        append(:shutdown)
         @thread.join
         @thread = nil
+        App.append(new_entry("stopped"))
       end
     end
 
@@ -40,6 +42,15 @@ module Thrifty::Logger
 
     private
 
+      def new_entry(msg)
+        Entry.new(
+          :info,
+          Time.now,
+          self.class,
+          msg
+        )
+      end
+
       def main_loop ; Thread.new do
         begin
           loop do

data/lib/thrifty/signals.rb

@@ -7,25 +7,42 @@ module Thrifty ; class Signals
 
   class << self
     def register(fn)
+      instance.install
       instance.register(fn)
     end
+
+    def register_after(fn)
+      instance.install
+      instance.register_after(fn)
+    end
   end
 
   def initialize
-    @handlers = []
-    @mutex    = Mutex.new
-    @resource = ConditionVariable.new
+    @handlers  = []
+    @after     = []
+    @mutex     = Mutex.new
+    @resource  = ConditionVariable.new
+    @installed = false
   end
 
   def install
-    %w{INT TERM}.each do |sig|
-      trap sig, &method(:shutdown)
+    unless @installed
+      %w{INT TERM}.each do |sig|
+        trap sig do
+          Thread.new{ shutdown }.join
+        end
+      end
+      @installed = true
     end
   end
 
   def wait
-    @mutex.synchronize do
-      @resource.wait(@mutex)
+    begin
+      @mutex.synchronize do
+        @resource.wait(@mutex)
+      end
+    rescue ::Interrupt
+      shutdown
     end
   end
 
@@ -33,8 +50,13 @@ module Thrifty ; class Signals
     @handlers << fn
   end
 
-  def shutdown
+  def register_after(fn)
+    @after << fn
+  end
+
+  def shutdown(sig = nil)
     @handlers.each {|fn| fn.call }
+    @after.each {|fn| fn.call }
 
     @mutex.synchronize do
       @resource.signal

data/lib/thrifty/version.rb

@@ -1,3 +1,3 @@
 module Thrifty
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dmexe-thrifty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dmitry Galinsky