anschel 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 570a1c3345f46d1907f3562693bd4bd24b2f96ce
-  data.tar.gz: 0b0255a6eead4b163c15735b0153be479322bb2b
+  metadata.gz: 5d32db0a5fe08817a91ac24c3d3e4cc57b53ce01
+  data.tar.gz: 4df5ae73011b3c6a8952b6c6366007f24241e842
 SHA512:
-  metadata.gz: c61e4dbb485c8de1d2bf81b43a2a7ac05654daa70cee72d7e5bcba1e8abcadbffb91052f2b6924699ac018bd9d2885a8e27275dcc658001778e3e454c7d39cc1
-  data.tar.gz: 08dc6b08958ff7f083ded85e1be80961dc2c97db9a26fe0c77e5865b677c1b1d717ff843d68f6c37215b24d3bcdd5b4f1f45cc08c77cfc71e35cb7afe7630ca5
+  metadata.gz: 73111befe962052809308f788bbb2ccf306992fbc0cbc2360f65c6ee107002c75e473768f8c970b211ee219d189671b72c8c1d0892c23c5f14fe66f384b1c41f
+  data.tar.gz: 1ee9dca9c94e851293b68beeff95221453245095cc81c636e570bad128e3d6510cbf9c17d02093a5f214e8dad2ded951ee2e383f199f2bd84fe11935e6a371e4

data/VERSION

@@ -1 +1 @@
-0.7.9
+0.7.10

data/lib/anschel/main.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'tempfile'
 
 require 'jrjackson'
+require 'rack'
 
 require_relative 'mjolnir'
 require_relative 'metadata'
@@ -68,7 +69,12 @@ module Anschel
         stats.create 'event'
         stats.get 'event'
 
-        ts = num_cpus.times.map do
+        ts = []
+
+        stats_port = config[:stats_port] || 3345
+        ts << stats_endpoint(stats, stats_port, log)
+
+        ts += num_cpus.times.map do
           Thread.new do
             loop do
               event = JrJackson::Json.load \
@@ -113,5 +119,27 @@ module Anschel
       log.send level, event: 'goodbye', version: VERSION
     end
 
+
+    def stats_endpoint stats, stats_port, log
+      ok = '200'
+      json = { 'Content-Type' => 'application/json' }
+
+      app = lambda do |_|
+        hash_stats = { version: VERSION }.merge stats.read
+        json_stats = JSON.pretty_generate hash_stats
+        [ ok, json, [ json_stats ] ]
+      end
+
+      t = Thread.new do
+        Rack::Handler::WEBrick.run app, \
+          Port: stats_port,
+          Logger: log,
+          AccessLog: []
+      end
+
+      log.info event: 'serving-metrics', port: stats_port
+      return t
+    end
+
   end
 end

data/lib/anschel/stats.rb

@@ -10,22 +10,14 @@ module Anschel
       @interval = interval || 30
       @stats    = Hash.new
       @lock     = Mutex.new
-
-      Thread.new do
-        loop do
-          sleep @interval
-          report_and_reset
-        end
-      end
-
       @logger.info event: 'stats-loaded'
     end
 
+    def read ; stats end
 
-    def create name, default=0
+    def create name, init=0
       with_lock do
-        stats[name] = {}
-        stats[name].default = default
+        stats[name] = init
         stats
       end
     end
@@ -38,25 +30,25 @@ module Anschel
 
     def inc name, by=1
       with_lock do
-        stats[name][:val] += by
+        stats[name] += by
       end
     end
 
     def dec name, by=1
       with_lock do
-        stats[name][:val] -= by
+        stats[name] -= by
       end
     end
 
     def set name, to
       with_lock do
-        stats[name][:val] = to
+        stats[name] = to
       end
     end
 
     def get name
       with_lock do
-        stats[name][:val]
+        stats[name]
       end
     end
 
@@ -69,26 +61,5 @@ module Anschel
         yield
       end
     end
-
-    def report_and_reset
-      ready_stats = with_lock do
-        stats.keys.flat_map do |k|
-          v = stats[k].delete(:val)
-          v ||= stats[k].default
-          stats[k][:val] = stats[k].default
-          [
-            [ k, v ],
-            [ "#{k}-rate", 1.0 * v / @interval ]
-          ]
-        end
-      end
-
-      return if stats.empty?
-      @logger.info \
-        event: 'stats',
-        version: Anschel::VERSION,
-        interval: @interval,
-        stats: Hash[ready_stats]
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anschel
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  name: rack
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Logstash-like for moving events from Kafka into Elasticsearch.
 email: sczizzo@gmail.com
 executables:
@@ -167,4 +181,3 @@ signing_key:
 specification_version: 4
 summary: Logstash-like for moving events from Kafka into Elasticsearch
 test_files: []
-has_rdoc: