liquid-ext 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4739125c0f045cc43cf1d3dc7658d0d06f0b64
-  data.tar.gz: e3bd9b7031b166c16c799c7064149bb2c2cc4499
+  metadata.gz: dfbcd20250a0066048dcab544302bca615d206dd
+  data.tar.gz: 8a243e57e1b841ad3d8332a7ddd40ec9d7644bdd
 SHA512:
-  metadata.gz: 02a4e55a0fc87c47b2e2f994c2d6ae8fe056847b5bc60968e3d0751d1cc852770bd93fd36f9d13eb6f6f870d33c10d21bca067441ea3e4ee1a568c67f434a4db
-  data.tar.gz: f732a993fc2509cbe4e89c73021d49170ec8776bd9a348a8d4fce366918c471a6577d52b3ce49e91bcabdcc0cda6175a410a5d0dd9a7e8f10e2e043e012b5990
+  metadata.gz: db62f25e0a6df2e7d7ed713f9835b5bb8167dcd03e64bf6cafdd386f6bcaaa036b8dfc04d1abcd07d798bc420b05cded59c827bda0e7a793d22d5ed0ec2e9c4e
+  data.tar.gz: ac739d492960eb506e17281fbd0548a8741c3e6f8c7495b633dfbe56bf438ed610f5451ee8e61e758b178951e481101dff8643f2963a6006de2463d34ccd038c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liquid-ext (3.0.0)
+    liquid-ext (3.1.0)
       activesupport
       erubis
       mixlib-cli
@@ -16,7 +16,7 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14-java)
+    atomic (1.1.15-java)
     awesome_print (1.2.0)
     bond (0.5.1-java)
     brice (0.2.9)
@@ -24,7 +24,6 @@ GEM
     cane (2.6.1)
       parallel
     coderay (1.1.0)
-    columnize (0.3.6)
     diff-lcs (1.2.5)
     docile (1.1.3)
     erubis (2.7.0)
@@ -34,7 +33,7 @@ GEM
       ruby-progressbar (~> 1.3)
     hirb (0.7.1)
     i18n (0.6.9)
-    liquid-development (0.2.0)
+    liquid-development (0.2.1)
       awesome_print
       bond
       brice
@@ -47,7 +46,6 @@ GEM
       rib
       ripl
       rspec
-      ruby-debug
       simplecov
       tailor
       timecop
@@ -77,14 +75,10 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
+    rspec-core (2.14.8)
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4-java)
     ruby-nuggets (0.9.6)
     ruby-progressbar (1.4.1)
     ruby2ruby (2.0.7)
@@ -110,8 +104,8 @@ GEM
       tins (~> 1.0)
     terminal-table (1.4.5)
     text-table (1.2.3)
-    thread_safe (0.1.3-java)
-      atomic
+    thread_safe (0.2.0-java)
+      atomic (>= 1.1.7, < 2)
     timecop (0.7.1)
     tins (1.0.0)
     tzinfo (0.3.38)

data/lib/liquid/boot.rb

@@ -54,14 +54,16 @@ require 'liquid/environment'
 require 'liquid/from_file'
 require 'liquid/hash_helper'
 require 'liquid/metrics'
+require 'liquid/server'
 require 'liquid/timing'
+require 'liquid/tracker'
 require 'liquid/transaction_id'
 require 'liquid/zmq'
 
 # configuration callbacks
 require 'liquid/logger'
 reload_logger = ->(conf) do
-  $log = Liquid::Logger.new("root")
+  $log ||= Liquid::Logger.new("root")
 end
 
 reload_mixins = ->(conf) do
@@ -88,6 +90,18 @@ $conf.mixin({
       level: :info,
       format: "%d{ISO8601} %-5p #{File.basename($0)}(#{Process.pid})[%t]: %m%n",
     },
+    tracker: {
+      dimensions: {},
+      kafka: {
+        enabled: false,
+        brokers: [
+          '0.0.0.0:9092'
+        ]
+      },
+    },
+    zmachine: {
+      debug: false,
+    },
   },
   production: {
     log: {

data/lib/liquid/logger.rb

@@ -14,6 +14,7 @@ module Liquid
       @progname = progname || File.basename($0)
       @logger = LoggerFactory.getLogger(name)
       @exceptions = {}
+      @exception_handlers = [method(:_log_error_exception)]
       root = org.apache.log4j.Logger.getRootLogger
       appender = org.apache.log4j.ConsoleAppender.new
       appender.name = "console"
@@ -74,7 +75,17 @@ module Liquid
       @logger.error(format(*args))
     end
 
+    def add_exception_handler(&block)
+      @exception_handlers << block
+    end
+
     def exception(exc, message = nil, attribs = {})
+      @exception_handlers.each do |callback|
+        callback.call(exc, message, attribs)
+      end
+    end
+
+    def _log_error_exception(exc, message, attribs)
       ::Metrics.meter("exception:#{exc.class.to_s.tableize}").mark
       @exceptions[exc.class] ||= {}
       @exceptions[exc.class][exc.backtrace.first] ||= [System.nano_time, 1, 1]

data/lib/liquid/server.rb

@@ -0,0 +1,46 @@
+require 'liquid/metrics'
+require 'liquid/tracker'
+
+module Liquid
+  class Server
+    def initialize
+      $log.info("#{self.class.name.downcase} #{RUBY_DESCRIPTION}")
+      $log.info("#{self.class.name.downcase}", env: Env.mode)
+      initialize_tracker
+      initialize_metrics
+    end
+
+    def initialize_tracker
+      if $conf.tracker.kafka.enabled
+        # http://kafka.apache.org/documentation.html#producerconfigs
+        properties = java.util.Properties.new
+        properties['metadata.broker.list'] = $conf.tracker.kafka.brokers.join(',')
+        properties['producer.type'] = 'async'
+        properties['serializer.class'] = 'kafka.serializer.StringEncoder'
+        $tracker = ::Tracker::KafkaTracker.new(properties, $conf.tracker.dimensions)
+      else
+        $tracker = ::Tracker::LoggerTracker.new($conf.tracker.dimensions)
+      end
+      Signal.register_shutdown_handler { $tracker.shutdown }
+    end
+
+    def initialize_metrics
+      ::Metrics.start
+      ::Metrics::TrackerReporter.new($tracker.with_topic('metrics'))
+      Signal.register_shutdown_handler { ::Metrics.stop }
+    end
+
+    def initialize_zmachine
+      ZMachine.logger = $log
+      ZMachine.debug = true if $conf.zmachine.debug
+      ZMachine.heartbeat_interval = 0.1
+      Signal.register_shutdown_handler { ZMachine.stop }
+    end
+
+    def run
+      # by default wait for all workers
+      Thread.join
+    end
+
+  end
+end

data/lib/liquid/tracker/base.rb

@@ -2,25 +2,26 @@ require 'liquid/tracker/json_serializer'
 
 module Tracker
   class Base
-    attr_accessor :serializer
+    attr_accessor :dimensions
 
     def initialize(dimensions = {})
-      @serializer = JsonSerializer.new(dimensions)
+      @dimensions = dimensions
     end
 
-    def with_topic(topic)
-      Topic.new(topic, self)
+    def with_topic(topic, serializer = nil)
+      Topic.new(topic, self, serializer)
     end
   end
 
   class Topic
-    def initialize(topic, tracker)
+    def initialize(topic, tracker, serializer = nil)
       @topic = topic
       @tracker = tracker
+      @serializer = (serializer || JsonSerializer).new(tracker.dimensions)
     end
 
     def event(obj)
-      @tracker.event(obj, @topic)
+      @tracker.event(@topic, @serializer.dump(obj))
     end
   end
 end

data/lib/liquid/tracker/blackhole_tracker.rb

@@ -2,7 +2,7 @@ require 'liquid/tracker/base'
 
 module Tracker
   class BlackholeTracker < Base
-    def event(obj, topic)
+    def event(topic, data)
     end
 
     def down?

data/lib/liquid/tracker/file_tracker.rb

@@ -3,10 +3,10 @@ require 'liquid/tracker/base'
 module Tracker
   class FileTracker < Base
 
-    def event(obj, topic)
+    def event(topic, data)
       file = File.open(File.join(ROOT, 'log', "tracker-#{topic}.log"), 'a')
       file.sync = true
-      file.write(@serializer.dump(obj))
+      file.write(data)
       file.write("\n")
       file.close
     end

data/lib/liquid/tracker/kafka_tracker.rb

@@ -24,8 +24,8 @@ module Tracker
       false
     end
 
-    def event(obj, topic)
-      @producer.send(KeyedMessage.new(topic, @serializer.dump(obj)))
+    def event(topic, data)
+      @producer.send(KeyedMessage.new(topic, data))
     rescue => e
       # TODO: maybe fall back to FileTracker here
       $log.exception(e, "failed to log event=#{obj.inspect}")

data/lib/liquid/tracker/logger_tracker.rb

@@ -3,8 +3,8 @@ require 'liquid/tracker/base'
 
 module Tracker
   class LoggerTracker < Base
-    def event(obj, topic)
-      $log.info("tracker:event:#{topic} #{@serializer.dump(obj)}")
+    def event(topic, data)
+      $log.info("tracker:event:#{topic} #{data}")
     end
 
     def down?

data/liquid-ext.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "liquid-ext"
-  spec.version       = "3.0.0"
+  spec.version       = "3.1.0"
   spec.authors       = ["LiquidM, Inc."]
   spec.email         = ["opensource@liquidm.com"]
   spec.description   = %q{Ruby core extensions and helper libraries}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-ext
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - LiquidM, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,7 @@ files:
 - lib/liquid/priority_selector.rb
 - lib/liquid/router.rb
 - lib/liquid/scala-library-2.10.3.jar
+- lib/liquid/server.rb
 - lib/liquid/slf4j-api-1.7.6.jar
 - lib/liquid/slf4j-log4j12-1.7.6.jar
 - lib/liquid/snappy-java-1.1.1-M1.jar