logjam_agent 0.8.2 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI5M2JhYTA2YTQzZGUwNmM2ZmRiOTQ2NmU1MmFmNzRmMWM5ZWE1YQ==
+    OGVlMTVjMWMzMTI1YzcxNzM3NTExZTc1MjQ3NmJkOTcxN2VhOTcyYw==
   data.tar.gz: !binary |-
-    YjVmYzNjMWYyYTk3ODUwZTgxNTg3ZTExMGQyZjgyNDU3YjVjNDNmMA==
+    YWI2N2Q1NTFkOTMxMTRlZWQwMjNlYWVlZGZmZGI1YjhmZGE4NDQwZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDFiNWRlYjMyNWRkYTQ1MjI3YTZlZGI2MDNhMmRjNGU4YWE4NTA0N2NhODY3
-    YjhhY2M2YWI1OTM1ZGJlMzY3ZjJjZTc2YTEwNThlYzE2Nzg5MzExM2Q0OTVi
-    NmM2OWZjM2E2MDJjY2E5ZGMwMDE0YzMzZTM3NmViY2JlN2Q1ODY=
+    YWEzMTVkNTUyNDUxMTZmZDUyNTY3YTNlMDI2NmI2YzgzMjM1NDI1ZWU0MmEz
+    MzdjZTA4ZmVjZTZiNjVkNTliOGU3ZmFhMTEzOTRkNGI1NzYyNmNlNTdkNWYw
+    ZTdkNjNjNjdlNWMxMjA4MmYwY2JmYmZmOTdiZGE5ZjAxNGZkMTc=
   data.tar.gz: !binary |-
-    ZmExZTkwZDRjNTgyNjYxYjIzMDRmMGY4YWU4ZjQzZWM0MDI5Y2YxNjcxNTMw
-    NjI3MTlmYmU0ZWNjMWRkNWYxZTYyZGMxOTVkYjEyZmM2NDZhMGQxN2E3OWI0
-    YmU4ODNhZWM1OGZmNGVmYzM1ZWY3ZjNmY2Q5NTk5NTZhOWNhZTY=
+    MDFlYTczMzNjMThlNDlmNTE0OTJmZTdlNzE4MTdmMzQ1OWU0MTRmYmEyODA0
+    ODkzOTJjOTZmZTA4NThmZjBkZTk0YjM5ZmRjNTUyNWMwZmNkMDI1OWJlZjM5
+    NzYwY2VhMTlhNjQwYTQ5NDUxZTU1MjQ3NjBlNzczZThkM2ZlODM=

data/README.rdoc

@@ -3,6 +3,6 @@
 Client side library for logjam.
 
 Provides a customized logger, which logs lines and sends combined request information via
-AMQP to logjam.
+AMQP or ZeroMQ to logjam.
 
 

data/lib/logjam_agent.rb

@@ -1,5 +1,4 @@
 require "socket"
-require "uuid4r"
 require "time_bandits"
 
 module LogjamAgent
@@ -119,6 +118,18 @@ module LogjamAgent
     EOS
   end
 
+  # setup uuid generation
+  begin
+    require "uuid4r"
+    def self.generate_uuid
+      UUID4R::uuid(1).gsub('-','')
+    end
+  rescue LoadError
+    def self.generate_uuid
+      SecureRandom.uuid.gsub('-','')
+    end
+  end
+
   # setup json encoding
   begin
     require "oj"

data/lib/logjam_agent/amqp_forwarder.rb

@@ -10,6 +10,7 @@ module LogjamAgent
       @env = env
       @config = default_options(app, env).merge!(opts)
       @exchange = @bunny = nil
+      ensure_bunny_gem_is_available
     end
 
     def default_options(app, env)
@@ -88,12 +89,11 @@ module LogjamAgent
 
     #TODO: verify socket_timout for ruby 1.9
     def bunny
-      @bunny ||=
-        begin
-          require "bunny" unless defined?(Bunny)
-          Bunny.new(:host => @config[:host], :socket_timeout => 1.0)
-        end
+      @bunny ||= Bunny.new(:host => @config[:host], :socket_timeout => 1.0)
     end
 
+    def ensure_bunny_gem_is_available
+      require "bunny" unless defined?(Bunny)
+    end
   end
 end

data/lib/logjam_agent/request.rb

@@ -13,7 +13,7 @@ module LogjamAgent
       @env = env
       @forwarder = Forwarders.get(app, env)
       @lines = []
-      @uuid = UUID4R::uuid(1).gsub('-','')
+      @uuid = LogjamAgent.generate_uuid
       @fields = initial_fields.merge(:request_id => @uuid, :host => LogjamAgent.hostname, :process_id => Process.pid, :lines => @lines)
       @mutex = Mutex.new
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/logjam_agent.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "i18n"
 
   s.add_runtime_dependency "activesupport"
-  s.add_runtime_dependency "uuid4r"
-  s.add_runtime_dependency "time_bandits", [">= 0.4"]
+  s.add_runtime_dependency "time_bandits", [">= 0.6.0"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logjam_agent
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -16,70 +16,56 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
   prerelease: false
   name: rake
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: i18n
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  name: i18n
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: activesupport
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
+  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: uuid4r
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  name: time_bandits
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  name: time_bandits
+        version: 0.6.0
 description: Logjam logger and request information forwarding
 email:
 - stefan.kaes@xing.com