currentsh 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ecb923ee99155d461618165552acea0938a7dc4
-  data.tar.gz: 4976337e606613ec578fb0a6d7ae05244af3ec87
+  metadata.gz: c4f702d9774084c47f2c4cc5c03d8c30adb4a1f3
+  data.tar.gz: bd38902531b45780da0fa1b171e752be475418c9
 SHA512:
-  metadata.gz: 2d14bf9642aaf7113ec28bf803e27b26adffb46a2c1e20cf41279ef87dd45da717ede08b40a5bc553a0385ba63b3d9431247ddcee01220eabd8b628bf18bf34c
-  data.tar.gz: 915a81449601f1da462c7ef100a11eaa20f2123dfc47a56a39d130e6f1a31c28e2a4e6f402f194aa9fd13821812b911f36444fac322f783e5e50cfee0651ca5e
+  metadata.gz: 5567fbc614ca388e8bb2378044a72a02cdd5c99e0c27c8183133e859378aabadac9266a82cb7fde71a5656ac549a78000e101e99da7cec8cf9d295b7a72a2850
+  data.tar.gz: 4520830c7bed4048a089cbb38c913fe10eacb3c7adf931119454a746b53d7b07afc9accea9fc09a7368ed43ce033a158e56ceb6e4121f9b9f33d628d9e440bc0

data/lib/currentsh.rb

@@ -11,3 +11,4 @@ module Currentsh
 end
 
 require 'currentsh/railtie' if defined?(Rails)
+require 'currentsh/sidekiq' if defined?(Sidekiq)

data/lib/currentsh/log_output.rb

@@ -4,8 +4,39 @@ module Currentsh
       @io = io
     end
 
+    def format(data)
+      "@current: #{data.to_json}\n"
+    end
+
     def <<(data)
-      @io.puts "@current: #{data.to_json}"
+      @io << format(data)
+    end
+
+    def self.with_context(msg)
+      Thread.current[:currrentsh_sidekiq_context] ||= []
+      Thread.current[:currrentsh_sidekiq_context] << msg
+      yield
+    ensure
+      Thread.current[:currrentsh_sidekiq_context].pop
+    end
+
+    def call(severity, time, program_name, message)
+      data = {
+        time: time,
+        process: ::Process.pid,
+        thread: Thread.current.object_id.to_s(36),
+        message: message
+      }
+
+      if ctx = context
+        data.merge! ctx
+      end
+
+      format data
+    end
+
+    def context
+      Thread.current[:currrentsh_sidekiq_context]
     end
   end
 end

data/lib/currentsh/process.rb

@@ -5,9 +5,16 @@ module Currentsh
     def initialize
       @output = LogOutput.new
       @trackers = []
+      @initializers = []
+    end
+
+    def add_initializer(&b)
+      @initializers << b
     end
 
     def track_rails!(app)
+      @initializers.each { |i| i.call }
+
       @output << { :type => "boot", :application => app.class.name }
       rails = RailsTracker.new(@output)
       rails.register

data/lib/currentsh/railtie.rb

@@ -2,11 +2,21 @@ require 'rails/railtie'
 
 module Currentsh
   class Railtie < Rails::Railtie
+    DYNO_RUN = /^run\./
+
     config.currentsh = ActiveSupport::OrderedOptions.new
     config.currentsh.enabled = false
+    config.currentsh.heroku_detect = true
 
     config.after_initialize do |app|
-      Currentsh::PROCESS.track_rails!(app) if app.config.currentsh.enabled
+      next unless app.config.currentsh.enabled
+
+      if config.currentsh.heroku_detect
+        # Disable logging in a heroku run session
+        next if dyno = ENV['DYNO'] and DYNO_RUN.match(dyno)
+      end
+
+      Currentsh::PROCESS.track_rails!(app)
     end
   end
 end

data/lib/currentsh/sidekiq.rb

@@ -0,0 +1,105 @@
+module Currentsh
+  class Sidekiq
+    def call(worker, msg, queue)
+      klass = msg['wrapped'] || worker.class.to_s
+
+      jid = msg['jid']
+      context = {
+        :class => klass,
+        :jit => jid
+      }
+
+      if bid = msg['bid']
+        context[:bid] = bid
+      end
+
+      LogOutput.with_context(context) do
+        begin
+          ts = start context
+
+          yield
+        rescue StandardError => ex
+          case ex
+          when Interrupt, SystemExit, SignalException
+            raise ex
+          else
+            error context, ex, ts
+            raise ex
+          end
+        else
+          stop context, ts
+        end
+      end
+    end
+
+    def start(context)
+      time = Time.now
+
+      data = {
+        time: time,
+        process: ::Process.pid,
+        thread: Thread.current.object_id.to_s(36),
+        event: "start",
+      }.merge!(context)
+
+      $stdout.puts "@current: #{JSON.generate(data)}"
+
+      time
+    end
+
+    def error(context, error, start)
+      data = {
+        time: Time.now,
+        process: ::Process.pid,
+        thread: Thread.current.object_id.to_s(36),
+        event: "error",
+        error: error.to_s,
+        elapse: (Time.now - start)
+      }.merge!(context)
+
+      $stdout.puts "@current: #{JSON.generate(data)}"
+    end
+
+    def stop(context, start)
+      data = {
+        time: Time.now,
+        process: ::Process.pid,
+        thread: Thread.current.object_id.to_s(36),
+        event: "stop",
+        elapse: (Time.now - start)
+      }.merge!(context)
+
+      $stdout.puts "@current: #{JSON.generate(data)}"
+    end
+
+    S = ::Sidekiq
+
+    def self.configure
+      S.configure_server do |config|
+        config.server_middleware do |chain|
+          chain.insert_before S::Middleware::Server::Logging, self
+          chain.remove S::Middleware::Server::Logging
+        end
+      end
+
+      oldlogger = S::Logging.logger
+
+      logger = Logger.new($stdout)
+      logger.level = Logger::INFO
+      logger.formatter = LogOutput.new
+
+      S::Logging.logger = logger
+    end
+  end
+end
+
+# If using Sidekiq with Rails (likely) then the Railtie will sort this out
+
+if defined?(Rails)
+  Currentsh::PROCESS.add_initializer do
+    Currentsh::Sidekiq.configure
+  end
+else
+  Currentsh::Sidekiq.configure
+end
+

data/lib/currentsh/version.rb

@@ -1,3 +1,3 @@
 module Currentsh
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: currentsh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ files:
 - lib/currentsh/process.rb
 - lib/currentsh/rails.rb
 - lib/currentsh/railtie.rb
+- lib/currentsh/sidekiq.rb
 - lib/currentsh/version.rb
 homepage: http://github.com/vektra/currentsh
 licenses: []