multimeter 1.1.3-java → 1.1.4-java

data/lib/multimeter.rb

@@ -310,19 +310,27 @@ module Multimeter
   end
 
   module Jmx
-    def jmx!
-      ::Yammer::Metrics::JmxReporter.start_default(@registry)
+    def jmx!(options={})
+      return if @jmx_reporter
+      @jmx_reporter = ::Yammer::Metrics::JmxReporter.new(@registry)
+      @jmx_reporter.start
+      if options[:recursive]
+        sub_registries.each do |registry|
+          registry.jmx!
+        end
+      end
     end
   end
 
   module Http
     def http!(rack_handler, options={})
-      server_thread = JavaConcurrency::Thread.new do
+      return if @server_thread
+      @server_thread = JavaConcurrency::Thread.new do
         rack_handler.run(create_app(self), options)
       end
-      server_thread.daemon = true
-      server_thread.name = 'multimeter-http-server'
-      server_thread.start
+      @server_thread.daemon = true
+      @server_thread.name = 'multimeter-http-server'
+      @server_thread.start
     end
 
     private
@@ -571,5 +579,5 @@ module Multimeter
     end
   end
 
-  GLOBAL_REGISTRY = registry('global', 'global')
+  GLOBAL_REGISTRY = registry('multimeter', 'global')
 end

data/lib/multimeter/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Multimeter
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multimeter
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metrics-core-jars