sidekiq_monitor 0.1.1 → 0.1.2

data/app/assets/javascripts/sidekiq/monitor/initialize.js.coffee.erb

@@ -1,7 +1,6 @@
-<% url_helpers = Sidekiq::Monitor::Engine.routes.url_helpers %>
 window.SidekiqMonitor =
   settings:
     api_url: (path) ->
-      "<%= url_helpers.sidekiq_monitor_path %>api/#{path}"
+      "<%= Sidekiq::Monitor.root_path %>api/#{path}"
     graphs: <%= Sidekiq::Monitor.options[:graphs].to_json %>
     poll_interval: <%= Sidekiq::Monitor.options[:poll_interval] %>

data/app/helpers/sidekiq/monitor/sidekiq_helper.rb

@@ -6,7 +6,7 @@ module Sidekiq
       end
 
       def root_path
-        Sidekiq::Monitor::Engine.routes.url_helpers.sidekiq_monitor_path
+        Sidekiq::Monitor.root_path
       end
     end
   end

data/lib/sidekiq/monitor.rb

@@ -26,6 +26,11 @@ module Sidekiq
     def self.table_name_prefix
       'sidekiq_'
     end
+
+    def self.root_path
+      sidekiq_monitor_path = Sidekiq::Monitor::Engine.routes.url_helpers.sidekiq_monitor_path
+      "#{::Rails.application.config.relative_url_root}#{sidekiq_monitor_path}"
+    end
   end
 end
 

data/lib/sidekiq/monitor/client/middleware.rb

@@ -7,8 +7,10 @@ module Sidekiq
         end
 
         def call(worker_class, item, queue)
-          @processor.queue(worker_class, item, queue)
-          yield
+          ActiveRecord::Base.connection_pool.with_connection do
+            @processor.queue(worker_class, item, queue)
+            yield
+          end
         end
       end
     end

data/lib/sidekiq/monitor/server/middleware.rb

@@ -7,15 +7,17 @@ module Sidekiq
         end
 
         def call(worker, msg, queue)
-          @processor.start(worker, msg, queue)
-          begin
-            return_value = yield
-          rescue Exception => exception
-            @processor.error(worker, msg, queue, exception)
-            raise exception
+          ActiveRecord::Base.connection_pool.with_connection do
+            @processor.start(worker, msg, queue)
+            begin
+              return_value = yield
+            rescue Exception => exception
+              @processor.error(worker, msg, queue, exception)
+              raise exception
+            end
+            @processor.complete(worker, msg, queue, return_value)
+            return_value
           end
-          @processor.complete(worker, msg, queue, return_value)
-          return_value
         end
       end
     end

data/lib/sidekiq/monitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Monitor
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq