ramon 0.4.3 → 0.4.4

data/benchmarks.rb

@@ -5,23 +5,39 @@ require "logger"
 require 'singleton'
 require "zmq"
 
-runs = 10000
-http_address = 'http://127.0.0.1:2464'
-http_bench = false
-zeromq_bench = true
-standart_bench = true
+require 'net/http'
+require 'json'
+
+runs = 10
+http_address = "http://127.0.0.1:2465"
+key = "u6ljlx2glnf8xq45ut1etkpxghmjpe3e"
+
+http_bench = true
+zeromq_bench = false
+standart_bench = false
 
 puts "Runs: #{runs}"
 
+#@post_path = "/api/log/#{key}"
+#@url = URI.parse(http_address)
+#@data = {"message" => 'ruby test' , "tags" => ['ruby']}.to_json
+ 
+
+#req = Net::HTTP::Post.new(@post_path, initheader = {'Content-Type' =>'application/json'})
+#req.body = @data
+#response = Net::HTTP.new(@url.host, @url.port).start {|http| http.request(req) }
+#puts "Response #{response.code} #{response.message}: #{response.body}"
+
 if http_bench == true
     Ramon.configure do |config|
         config.address  = http_address
-        config.logger = Logger.new("/dev/null")
+        config.secret_key = "u6ljlx2glnf8xq45ut1etkpxghmjpe3e"
+        config.logger = Logger.new(STDOUT)
     end
 
     start_time = Time.now
     (1..runs).each { 
-        Ramon.log('test')
+        Ramon.log('ruby test')
     }
     end_time = Time.now
     puts "HTTP logging #{(end_time - start_time)} seconds"

data/lib/ramon/configuration.rb

@@ -1,14 +1,11 @@
 module Ramon
     class Configuration
         class ConfigurationException < StandardError; end
-        OPTIONS = [:app_key, :address, :secret, :protocol,
+        OPTIONS = [:secret_key, :address, :secret, :protocol,
             :environment_name, :framework, :project_root].freeze
 
-        # The Aplication key. Only in Amon Plus.
-        attr_accessor :app_key
-
-        # Secret key, used for securely logging in the normal Amon version
-        attr_accessor :secret
+        # Secret key, used for securely logging 
+        attr_accessor :secret_key
 
         # The host to connect to (defaults to 127.0.0.1).
         attr_accessor :address
@@ -32,9 +29,8 @@ module Ramon
         attr_accessor :protocol
         
         def initialize
-            @address                    = 'http://127.0.0.1:2464'
-            @app_key                  = ''
-            @secret                   = ''
+            @address                  = 'http://127.0.0.1:2464'
+            @secret_key               = ''
             @framework                = 'Standalone'
             @protocol                 = 'http'
         end

data/lib/ramon/sender.rb

@@ -7,20 +7,16 @@ module Ramon
         def initialize(options = {})
             [ :address, 
                 :protocol,
-                :app_key,
-                :secret
+                :secret_key
             ].each do |option|
                 instance_variable_set("@#{option}", options[option])
             end
         end
 
-        attr_reader :address, 
-            :protocol,
-            :app_key,
-            :secret
+        attr_reader :address, :protocol, :secret_key
 
         def log(level, message)
-            logger.send level, '** Amon '+ message
+            logger.send level, ''+ message
 		end
 
 
@@ -30,31 +26,32 @@ module Ramon
 
 
         def url
-            URI.parse("#{address}/api/")
+            URI.parse("#{address}")
         end
 
         def post_http(type, data = {})
             
             if type == 'log'
-                @url = "#{url}log/#{app_key}"
+                @path = "/api/log/#{secret_key}"
             else
-                @url = "#{url}exception/#{app_key}"
+                @path = "/api/exception/#{secret_key}"
             end
 
-            request = Net::HTTP::Post.new(@url, initheader = {'Content-Type' =>'application/json'})
+            request = Net::HTTP::Post.new(@path, initheader = {'Content-Type' =>'application/json'})
             request.body = data.to_json
 
             begin
                 response = Net::HTTP.new(url.host, url.port).start {|http| http.request(request) }
+                
                 case response
                 when Net::HTTPSuccess
-                    log :info, "#{@url} - #{response.message}"
+                    log :info, "#{url}#{@path} - #{response.message}"
                     return response
                 else
-                    log :error, "#{@url} - #{response.code} - #{response.message}"
+                    log :error, "#{url}#{@path} - #{response.code} - #{response.message}"
                 end
             rescue Exception => e
-                log :error, "[Ramon::Sender#post] Cannot send data to #{@url} Error: #{e.class} - #{e.message}"
+                log :error, "[Ramon::Sender#post] Cannot send data to #{url}#{@path} Error: #{e.class} - #{e.message}"
                 nil 
             end
         end
@@ -62,8 +59,9 @@ module Ramon
         def post_zeromq(type, data = {})
             if defined?(ZMQ)
                 json_data = {:type => type, :content =>  data}
-                if app_key
-                    json_data['app_key'] = app_key
+                
+                if secret_key
+                    json_data['secret_key'] = secret_key
                 end
 
                 json_data = json_data.to_json

data/lib/ramon/version.rb

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

data/spec/web_spec.rb

@@ -9,6 +9,7 @@ module Ramon
 
             Ramon.configure do |config|
                 config.address  = 'http://127.0.0.1:2465'
+                config.secret_key = "u6ljlx2glnf8xq45ut1etkpxghmjpe3e"
                 config.logger = Logger.new(STDOUT)
             end
             

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ramon
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - martinrusev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-27 00:00:00 Z
+date: 2012-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json