Reorganizing code

Also adds a #restart method to reporters to restart the reporter thread.

lib/metriks/reporter/graphite.rb

@@ -2,9 +2,11 @@
 module Metriks::Reporter
   class Graphite
     def initialize(host, port, options = {})
-      @host      = host
-      @port      = port
-      @prefix    = options[:prefix]
+      @host = host
+      @port = port
+
+      @prefix = options[:prefix]
+
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
       @on_errror = options[:on_error] || proc { |ex| }
@@ -36,6 +38,11 @@ def stop
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     def write
       @registry.each do |name, metric|
         case metric

lib/metriks/reporter/librato_metrics.rb

@@ -19,13 +19,15 @@ def self.connection
 
 
     def initialize(email, token, options = {})
-      @email     = email
-      @token     = token
-      @prefix    = options[:prefix]
+      @email = email
+      @token = token
+
+      @prefix = options[:prefix]
+      @source = options[:source]
+
       @registry  = options[:registry] || Metriks::Registry.default
       @interval  = options[:interval] || 60
       @on_errror = options[:on_error] || proc { |ex| }
-      @source    = options[:source]
     end
 
     def start
@@ -49,6 +51,11 @@ def stop
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     def write
       gauges = []
       @registry.each do |name, metric|

lib/metriks/reporter/logger.rb

@@ -3,12 +3,13 @@
 module Metriks::Reporter
   class Logger
     def initialize(options = {})
-      @registry  = options[:registry]  || Metriks::Registry.default
       @logger    = options[:logger]    || ::Logger.new(STDOUT)
       @log_level = options[:log_level] || ::Logger::INFO
       @prefix    = options[:prefix]    || 'metriks:'
-      @interval  = options[:interval]  || 60
-      @on_errror = options[:on_error]  || proc { |ex| }
+
+      @registry  = options[:registry] || Metriks::Registry.default
+      @interval  = options[:interval] || 60
+      @on_errror = options[:on_error] || proc { |ex| }
     end
 
     def start
@@ -32,6 +33,11 @@ def stop
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     def write
       @registry.each do |name, metric|
         case metric

lib/metriks/reporter/proc_title.rb

@@ -1,11 +1,12 @@
 module Metriks::Reporter
   class ProcTitle
     def initialize(options = {})
+      @rounding = options[:rounding] || 1
+      @prefix   = options[:prefix]   || $0.dup
+
       @interval  = options[:interval] || 5
-      @rounding  = options[:rounding] || 1
       @on_errror = options[:on_error] || proc { |ex| }
 
-      @prefix   = $0.dup
       @metrics  = []
     end
 
@@ -40,6 +41,11 @@ def stop
       @thread = nil
     end
 
+    def restart
+      stop
+      start
+    end
+
     protected
     def generate_title
       @metrics.collect do |name, suffix, block|