logjam_agent 0.3.0 → 0.3.1

data/lib/logjam_agent.rb

@@ -1,3 +1,4 @@
+require "socket"
 require "logjam_agent/version"
 require "logjam_agent/amqp_forwarder"
 require "logjam_agent/forwarders"
@@ -18,6 +19,18 @@ module LogjamAgent
   mattr_accessor :environment_name
   self.environment_name = nil
 
+  def self.get_hostname
+    n = Socket.gethostname
+    if n.split('.').size > 1
+      n
+    else
+      Socket.gethostbyname(n) rescue n
+    end
+  end
+
+  mattr_accessor :hostname
+  self.hostname = self.get_hostname
+
   def self.disable!
     self.disabled = true
   end

data/lib/logjam_agent/rack/logger.rb

@@ -3,7 +3,7 @@ module LogjamAgent
     class Logger < ActiveSupport::LogSubscriber
       def initialize(app)
         @app = app
-        @hostname = Socket.gethostname
+        @hostname = LogjamAgent.hostname
       end
 
       def call(env)

data/lib/logjam_agent/request.rb

@@ -1,17 +1,14 @@
 require "json"
-require "socket"
 
 module LogjamAgent
   class Request
     attr_reader :fields
 
-    @@hostname = Socket.gethostname.split('.').first
-
     def initialize(app, env, logger, initial_fields)
       @logger = logger
       @forwarder = Forwarders.get(app, env)
       @lines = []
-      @fields = initial_fields.merge(:host => @@hostname, :process_id => Process.pid, :lines => @lines)
+      @fields = initial_fields.merge(:host => LogjamAgent.hostname, :process_id => Process.pid, :lines => @lines)
     end
 
     def add_line(severity, timestamp, message)

data/lib/logjam_agent/syslog_like_formatter.rb

@@ -1,10 +1,9 @@
-require 'socket'
 require 'logger'
 
 module LogjamAgent
   class SyslogLikeFormatter
     def initialize
-      @hostname = Socket.gethostname.split('.').first
+      @hostname = LogjamAgent.hostname
       @app_name = "rails"
       @attributes = []
     end

data/lib/logjam_agent/version.rb

@@ -1,3 +1,3 @@
 module LogjamAgent
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logjam_agent
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +02:00
+date: 2011-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency