ocean-rails 1.29.1 → 1.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3236195a6f9bc09b82f30b266134bdee733b6877
-  data.tar.gz: da30535ec21331c8881a1762fa19ff7018cb5509
+  metadata.gz: 2ae893fab5ff15b722a770f78dc3a8cc5c3e2a85
+  data.tar.gz: 41be8d155e026f08656b3e9eec974c04d3e93522
 SHA512:
-  metadata.gz: f9678c833b9e144b0b67f1feb0e184697972a513df86f1c299715ac927f435537fede88c1c95bef8ec8974603d34cd1559a7f900f65801f9915702c99d1c0881
-  data.tar.gz: da707d98896f96f514c1d0b343a1ea5b08942458c66cc6d9b8778e6afdf4080ab7274e82c4002537c0f2280e600c65363a26526646eceae34f6a71c9c478c3e4
+  metadata.gz: 5dc70080114ec6aa9ec9812c1f6c7c3de720bbe1b3f265d2d9bb0367a5e6cc15720709bf5f8b3b7bd14fdca053a17b7a3df8952bb17752e51ca054008e01f7e3
+  data.tar.gz: 585963133384bc06788fb2fd5ee61646d98767c414bcc97f8ef33ec99ad4b3e675779baf1fbe625f7835b24231e7f9177dc84f7409034f15940ac1584382b83c

data/config/initializers/zeromq_logger.rb

@@ -1,14 +1,5 @@
-# If we're running in production, assign another ZMQ logger here.
-# Another one is assigned in the app's config/application.rb - for some
-# reason, assigning one in config/environments/production.rb won't work.
-# Why this is so is an irritating mystery.
-
 if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
 
-  # Use a different logger for distributed setups
-  Rails.logger = ZeromqLogger.new
-  Rails.logger.level = Logger::INFO
-
   # Announce us
   Rails.logger.info "Initialising Rails process"
 

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -90,21 +90,16 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     git :init
   end
 
-  def add_production_zeromq_logging
-    inject_into_file 'config/application.rb', before: "module " do <<-'RUBY'
-# If we're running in production, assign the first ZMQ logger here
-# (another one is assigned by the ocean-rails gem in an initializer).
-# Why this has to be done in two distinct places is an irritating mystery.
-Rails.logger = ZeromqLogger.new if Rails.env == "production"
-
-RUBY
-    end
-  end  
+  def add_zeromq_logging_in_production
+    prepend_to_file 'config/environments/production.rb',
+                    "Rails.logger = ZeromqLogger.new\n\n"
+  end
 
   def turn_off_view_logging_in_production
     application(nil, env: "production") do
       "# We don't want to see view render lines in production.
-       config.action_view.logger = nil"
+       config.action_view.logger = nil
+       "
     end
   end
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.29.1"
+  VERSION = "1.29.2"
 end

data/lib/ocean/zero_log.rb

@@ -1,6 +1,5 @@
 require 'ffi-rzmq'
 
-
 #
 # This is the class that provides the interface to ZeroMQ, both for sending log
 # data to a cluster of log servers, and for receiving it.
@@ -24,8 +23,8 @@ class ZeroLog
   # set up for the use of all threads in the process. A process exit 
   # handler will be set up to terminate the context on exit.
   #
-  def initialize
-    super
+  def initialize(sub_push, log_hosts)
+    super()
     unless @@context
       #puts "Creating context"
       @@context = ZMQ::Context.new(1)
@@ -33,15 +32,18 @@ class ZeroLog
       at_exit { @@context.terminate
                 #puts "Context terminated" 
               }
+      #puts "Initialising the log data sender thread"
+      setup_sub_server(sub_push, log_hosts)
     end
-  end
+    connect_to_sub_server(sub_push)
+ end
 
 
   #
   # This method returns the ZeroMQ Context object.
   #
   def context
-  	@@context
+    @@context
   end
 
 
@@ -75,7 +77,7 @@ class ZeroLog
   # all available +LOG_HOSTS+. ZeroMQ handles buffering, re-connection and multiplexing
   # (round-robin) to the +LOG_HOSTS+ +PULL+ servers.
   #
-  def init_log_data_sender(sub_push="sub_push")
+  def setup_sub_server(sub_push="sub_push", log_hosts=[])
     # First create the server and let it bind, as this is required
     # when using inproc: bind must precede any connects.
     Thread.new(context) do |c|
@@ -87,7 +89,7 @@ class ZeroLog
       subscriber.setsockopt(ZMQ::SUBSCRIBE, "")
       # Set up the PUSH socket
       loggers = context.socket(ZMQ::PUSH)
-      LOG_HOSTS.each do |host|
+      log_hosts.each do |host|
         #puts "Connecting to the PULL server #{host}"
         loggers.connect("tcp://#{host}:10000")
       end
@@ -100,9 +102,11 @@ class ZeroLog
       loggers.close
       #puts "Closed sockets in other thread"
     end
-
     sleep 0.1  # Brute force and primitive, but it works
+  end
+
 
+  def connect_to_sub_server(sub_push="sub_push")
     # Next create the PUB socket and connect it to the other thread
     #puts "Creating the PUB socket"
     $log_publisher = context.socket(ZMQ::PUB) 
@@ -146,10 +150,10 @@ class ZeroLog
   # round-robin fashion to each PULL log worker on the machine.
   #
   def pull_server(address=PUSH_ADDRESS)
-  	#puts "Starting PULL server"
-  	puller = context.socket(ZMQ::PULL)
-  	#puts "Binding to the PULL socket"
-  	puller.bind("tcp://*:10000")
+    #puts "Starting PULL server"
+    puller = context.socket(ZMQ::PULL)
+    #puts "Binding to the PULL socket"
+    puller.bind("tcp://*:10000")
     # Set up the PUSH socket
     pusher = context.socket(ZMQ::PUSH)
     #puts "Binding to the PUSH socket"
@@ -167,17 +171,17 @@ class ZeroLog
   # processing (such as storing received log info in a database).
   #
   def pull_worker(address=PUSH_ADDRESS)
-  	#puts "Starting PULL worker"
-  	puller = context.socket(ZMQ::PULL)
-  	#puts "Connect to the PUSH socket"
+    #puts "Starting PULL worker"
+    puller = context.socket(ZMQ::PULL)
+    #puts "Connect to the PUSH socket"
     puller.connect(address)
     trap_int(puller)
 
-  	while true do
-  	  s = ''
-  	  puller.recv_string(s)
-  	  puts "Received: #{s}"
-  	end
+    while true do
+      s = ''
+      puller.recv_string(s)
+      puts "Received: #{s}"
+    end
   end
 
 

data/lib/ocean/zeromq_logger.rb

@@ -9,7 +9,6 @@ require 'socket'
 class ZeromqLogger
 
   attr_accessor :level, :log_tags
-  attr_accessor :formatter
 
   #
   # Obtains the IP of the current process, initialises the @logger object
@@ -20,10 +19,12 @@ class ZeromqLogger
     super
     # Get info about our environment
     @ip = Socket.ip_address_list.detect{|intf| intf.ipv4_private?}.getnameinfo[0] 
+    # Find the log hosts
+    f = File.join(Rails.root, "config/config.yml")
+    cfg = YAML.load(ERB.new(File.read(f)).result)
+    @log_hosts = cfg['LOG_HOSTS'].blank? ? cfg['production']['LOG_HOSTS'] : cfg['LOG_HOSTS'] 
     # Set up the logger
-    @logger = ZeroLog.new
-    @logger.init_log_data_sender "/tmp/sub_push_#{Process.pid}"
-    @formatter = ::Logger::Formatter.new
+    @logger = ZeroLog.new "/tmp/sub_push_#{Process.pid}", @log_hosts
   end
 
   #
@@ -70,11 +71,10 @@ class ZeromqLogger
   #
   # +msg+:       The log message itself. 
   #
-  def add(level, msg, progname="")
+  def add(level, msg)
     return true if level < @level
-    msg = progname if msg.blank?
     return true if msg.blank?       # Don't send
-    #puts "Adding #{level} #{msg} #{progname}"
+    #puts "Adding #{level} #{msg}"
     milliseconds = (Time.now.utc.to_f * 1000).to_i
     data = { timestamp: milliseconds,
              ip:        @ip,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.29.2
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday