nats 0.4.24 → 0.4.26

data/HISTORY.md

@@ -1,5 +1,10 @@
 # HISTORY
 
+## v0.4.26 (July 30, 2012)
+  - Syslog support
+  - Fixed reconnect bug to authorized servers
+  - See full list @ https://github.com/derekcollison/nats/compare/v0.4.24...v0.4.26
+
 ## v0.4.24 (May 24, 2012)
 
   - Persist queue groups across reconnects

data/lib/nats/client.rb

@@ -8,7 +8,7 @@ require "#{ep}/ext/json"
 
 module NATS
 
-  VERSION = '0.4.24'.freeze
+  VERSION = '0.4.26'.freeze
 
   DEFAULT_PORT = 4222
   DEFAULT_URI = "nats://localhost:#{DEFAULT_PORT}".freeze
@@ -439,7 +439,7 @@ module NATS
       cs[:pass] = @uri.password
     end
     cs[:ssl_required] = @ssl if @ssl
-    send_command("CONNECT #{cs.to_json}#{CR_LF}")
+    send_command("CONNECT #{cs.to_json}#{CR_LF}", true)
   end
 
   def queue_server_rt(&cb) #:nodoc:
@@ -613,9 +613,11 @@ module NATS
     @reconnect_cb.call unless @reconnect_cb.nil?
   end
 
-  def send_command(command) #:nodoc:
+  def send_command(command, priority = false) #:nodoc:
     EM.next_tick { flush_pending } if (connected? && @pending.nil?)
-    (@pending ||= []) << command
+    @pending ||= []
+    @pending << command unless priority
+    @pending.unshift(command) if priority
     @pending_size += command.bytesize
     flush_pending if (connected? && @pending_size > MAX_PENDING_SIZE)
     if (@options[:fast_producer_error] && pending_data_size > FAST_PRODUCER_THRESHOLD)

data/lib/nats/server.rb

@@ -2,6 +2,7 @@
 require 'socket'
 require 'fileutils'
 require 'pp'
+require 'syslog'
 
 ep = File.expand_path(File.dirname(__FILE__))
 

data/lib/nats/server/const.rb

@@ -1,7 +1,7 @@
 
 module NATSD #:nodoc:
 
-  VERSION  = '0.4.24'
+  VERSION  = '0.4.26'
   APP_NAME = 'nats-server'
 
   DEFAULT_PORT = 4222

data/lib/nats/server/options.rb

@@ -27,6 +27,7 @@ module NATSD
 
           opts.on("-l", "--log FILE", "File to redirect log output")           { |file| @options[:log_file] = file }
           opts.on("-T", "--logtime", "Timestamp log entries (default: false)") { @options[:log_time] = true }
+          opts.on("-S", "--syslog IDENT", "Enable Syslog output")              { |ident| @options[:syslog] = ident }
           opts.on("-D", "--debug", "Enable debugging output")                  { @options[:debug] = true }
           opts.on("-V", "--trace", "Trace the raw protocol")                   { @options[:trace] = true }
 
@@ -77,6 +78,7 @@ module NATSD
         @options[:pid_file] = config['pid_file'] if @options[:pid_file].nil?
         @options[:log_file] = config['log_file'] if @options[:log_file].nil?
         @options[:log_time] = config['logtime'] if @options[:log_time].nil?
+        @options[:syslog] = config['syslog'] if @options[:syslog].nil?
         @options[:debug] = config['debug'] if @options[:debug].nil?
         @options[:trace] = config['trace'] if @options[:trace].nil?
 
@@ -116,6 +118,15 @@ module NATSD
         $stderr.reopen($stdout)
       end
 
+      def open_syslog
+        return unless @options[:syslog]
+        Syslog.open("#{@options[:syslog]}", Syslog::LOG_PID,  Syslog::LOG_USER ) unless Syslog.opened? 
+      end
+
+      def close_syslog
+        Syslog.close if @options[:syslog]
+      end
+
       def symbolize_users(users)
         return nil unless users
         auth_users = []
@@ -145,6 +156,9 @@ module NATSD
         debug "DEBUG is on"
         trace "TRACE is on"
 
+        # Syslog
+        @syslog = @options[:syslog]
+
         # Authorization
 
         # Multi-user setup for auth

data/lib/nats/server/server.rb

@@ -6,7 +6,7 @@ module NATSD #:nodoc: all
   class Server
 
     class << self
-      attr_reader :id, :info, :log_time, :auth_required, :ssl_required, :debug_flag, :trace_flag, :options
+      attr_reader :id, :info, :log_time, :auth_required, :ssl_required, :debug_flag, :trace_flag, :syslog, :options
       attr_reader :max_payload, :max_pending, :max_control_line, :auth_timeout, :ssl_timeout, :ping_interval, :ping_max
       attr_accessor :varz, :healthz, :max_connections, :num_connections, :in_msgs, :out_msgs, :in_bytes, :out_bytes
 
@@ -75,6 +75,7 @@ module NATSD #:nodoc: all
         end
 
         setup_logs
+        open_syslog
 
         # Setup optimized select versions
         EM.epoll unless @options[:noepoll]

data/lib/nats/server/util.rb

@@ -5,17 +5,26 @@ def fast_uuid #:nodoc:
   "%04x%04x%04x%04x%04x%06x" % v
 end
 
+def syslog(args, priority) #:nodoc:
+  Syslog::log(priority, '%s', PP::pp(args.compact, '', 120))
+end
+
 def log(*args) #:nodoc:
+  return syslog(args, Syslog::LOG_NOTICE) if NATSD::Server.syslog
   args.unshift(Time.now) if NATSD::Server.log_time
   PP::pp(args.compact, $stdout, 120)
 end
 
 def debug(*args) #:nodoc:
-  log(*args) if NATSD::Server.debug_flag?
+  return unless NATSD::Server.debug_flag?
+  return syslog(args, Syslog::LOG_INFO) if NATSD::Server.syslog
+  log(*args)
 end
 
 def trace(*args) #:nodoc:
-  log(*args) if NATSD::Server.trace_flag?
+  return unless NATSD::Server.trace_flag?
+  return syslog(args, Syslog::LOG_DEBUG) if NATSD::Server.syslog
+  log(*args)
 end
 
 def log_error(e=$!) #:nodoc:
@@ -56,6 +65,7 @@ end
 def shutdown #:nodoc:
   puts
   log 'Server exiting..'
+  NATSD::Server.close_syslog
   EM.stop
   if NATSD::Server.pid_file
     FileUtils.rm(NATSD::Server.pid_file) if File.exists? NATSD::Server.pid_file

data/nats.gemspec

@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('eventmachine', '>= 0.12.10')
   s.add_dependency('json_pure', '>= 1.7.3')
   s.add_dependency('daemons', '>= 1.1.5')
-  s.add_dependency('thin', '>= 1.3.1')
+  s.add_dependency('thin', '>= 1.4.1')
 
   s.require_paths = ['lib']
   s.bindir = 'bin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nats
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70102540108020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70102540108020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &70102540107180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70102540107180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70102540106400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +53,28 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70102540106400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70102540257660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70102540257660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 description: A lightweight cloud messaging system.
 email:
 - derek.collison@gmail.com
@@ -112,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A lightweight cloud messaging system.