ramon 0.4.2 → 0.4.3

data/Gemfile

@@ -4,6 +4,5 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rails', :group => :test 
-
-
+gem 'zmq'
 gem 'ramon', :path => '~/ramon'

data/benchmarks.rb

@@ -1,39 +1,91 @@
 require "rubygems"
+require "bundler/setup"
 require "ramon"
 require "logger"
+require 'singleton'
+require "zmq"
 
-Ramon.configure do |config|
-    config.address  = 'http://127.0.0.1:2465'
-    config.logger = Logger.new("/dev/null")
+runs = 10000
+http_address = 'http://127.0.0.1:2464'
+http_bench = false
+zeromq_bench = true
+standart_bench = true
+
+puts "Runs: #{runs}"
+
+if http_bench == true
+    Ramon.configure do |config|
+        config.address  = http_address
+        config.logger = Logger.new("/dev/null")
+    end
+
+    start_time = Time.now
+    (1..runs).each { 
+        Ramon.log('test')
+    }
+    end_time = Time.now
+    puts "HTTP logging #{(end_time - start_time)} seconds"
 end
 
-start_time = Time.now
-(1..1000).each { 
-    Ramon.log('test')
-}
-end_time = Time.now
-puts "HTTP logging #{(end_time - start_time)} seconds"
 
+if zeromq_bench == true
+
+class ZeroMQ
+  include Singleton
+   
+  @@address = ""
+  def self.address= address
+    @@address = address
+  end
+
+  def initialize
+    @context = ZMQ::Context.new(1)
+    @socket = @context.socket(ZMQ::DEALER) 
+    @socket.connect("tcp://#{@@address}")
+    @socket.setsockopt(ZMQ::LINGER, 0) 
+    @socket.setsockopt(ZMQ::SWAP, 25000000) # 25MB disk swap
+  end
+
+  def post(data)
+    @socket.send(data, ZMQ::NOBLOCK)
+  end
 
-Ramon.configure do |config|
-    config.address  = '127.0.0.1:5464'
-    config.protocol = 'zeromq'
-    config.logger = Logger.new("/dev/null")
 end
 
-start_time = Time.now
-(1..1000).each { 
-    Ramon.log('test')
-}
-end_time = Time.now
-puts "ZeroMQ logging #{(end_time - start_time)} seconds"
-
-
-log = Logger.new('bench.log') 
-start_time = Time.now
-(1..1000).each { 
-    log.info('test')
-}
-end_time = Time.now
-puts "Standard logging #{(end_time - start_time)} seconds"
+    #start_time = Time.now
+    #(1..runs).each { 
+        #json_data = {:type => 'log', :content =>  {:message => 'zeromq test'}}
+        #json_data = json_data.to_json
+        #ZeroMQ.address = '127.0.0.1:5464'
+        #ZeroMQ.instance.post(json_data)
+    #}
+    #end_time = Time.now
+    #puts "ZeroMQ logging #{(end_time - start_time)} seconds"
+
+    Ramon.configure do |config|
+        config.address  = '127.0.0.1:5464'
+        config.protocol = 'zeromq'
+        config.logger = Logger.new(STDOUT)
+    end
+    
+    start_time = Time.now
+    (1..runs).each { 
+        Ramon.log('ramon zeromq test')
+    }
+    end_time = Time.now
+    puts "Ramon ZeroMQ logging #{(end_time - start_time)} seconds"
+
+
+end
+
+
+if standart_bench == true
+    log = Logger.new('bench.log') 
+    start_time = Time.now
+    (1..runs).each { 
+        log.info('test')
+    }
+    end_time = Time.now
+    puts "Standard logging #{(end_time - start_time)} seconds"
+end
 

data/lib/ramon.rb

@@ -12,6 +12,7 @@ require_local  "enviroment_data"
 
 require_local  "integration/rails" if defined?(Rails)
 require_local  "railtie" if defined?(Rails)
+require_local  "zeromq" if defined?(ZMQ)
 
 module Ramon
 

data/lib/ramon/sender.rb

@@ -1,10 +1,6 @@
 require 'net/http'
 require 'json'
 require 'zlib'
-begin
-  require 'zmq'
-rescue LoadError
-end
 
 module Ramon
     class Sender
@@ -65,22 +61,17 @@ module Ramon
 
         def post_zeromq(type, data = {})
             if defined?(ZMQ)
-                context = ZMQ::Context.new()
-                socket = context.socket(ZMQ::DEALER) 
-                socket.connect("tcp://#{address}")
-                socket.setsockopt(ZMQ::LINGER,0) 
-                json_data = {:type => type,
-                            :content =>  data}
+                json_data = {:type => type, :content =>  data}
                 if app_key
                     json_data['app_key'] = app_key
                 end
 
                 json_data = json_data.to_json
 
-                socket.send(json_data, ZMQ::NOBLOCK)
-                socket.close()
-                context.close()
-                true
+                ZeroMQ.address = address
+                ZeroMQ.instance.post(json_data)
+            else
+                puts "ZeroMQ is not installed. You can install it with `gem install zmq`"
             end
         end
 

data/lib/ramon/version.rb

@@ -1,3 +1,3 @@
 module Ramon
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/ramon/zeromq.rb

@@ -0,0 +1,24 @@
+require 'singleton'
+module Ramon
+    class ZeroMQ
+        include Singleton
+        @@address = ""
+        def self.address= address
+            @@address = address
+        end
+
+        def initialize
+            context = ZMQ::Context.new(1)
+            @socket = context.socket(ZMQ::DEALER) 
+            @socket.connect("tcp://#{@@address}")
+            @socket.setsockopt(ZMQ::LINGER, 0) 
+            @socket.setsockopt(ZMQ::SWAP, 25000000) # 25MB disk swap
+        end
+
+        def post(data)
+            @socket.send(data, ZMQ::NOBLOCK)
+        end
+
+    end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ramon
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - martinrusev
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-07 00:00:00 +01:00
-default_executable: 
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -56,6 +55,7 @@ files:
 - lib/ramon/railtie.rb
 - lib/ramon/sender.rb
 - lib/ramon/version.rb
+- lib/ramon/zeromq.rb
 - ramon.gemspec
 - spec/config_spec.rb
 - spec/exception_data_spec.rb
@@ -64,7 +64,6 @@ files:
 - spec/spec_helper.rb
 - spec/web_spec.rb
 - spec/zeromq_spec.rb
-has_rdoc: true
 homepage: http://amon.cx
 licenses: []
 
@@ -94,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ramon
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby binding for Amon