wildcloud-router 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.3 (30.12.2011)
+
+* big rewrite
+* depend on wildcloud-logger and wildcloud-configuration
+* reporting
+* basic support for keep-alive from clients
+
 ## 0.0.2 (30.12.2011)
 
 * bugfix: race condition in connection to backend server

data/bin/wildcloud-router

@@ -22,6 +22,14 @@ require 'eventmachine'
 
 require 'wildcloud/router/server'
 
+begin
+    EventMachine.epoll
+end
+
+begin
+    EventMachine.kqueue
+end
+
 EventMachine.run do
     Wildcloud::Router::Server.start
 end

data/lib/wildcloud/router/cache.rb

@@ -0,0 +1,23 @@
+module Wildcloud
+  module Router
+    class Cache
+
+      def self.put(target, connection)
+        @connections ||= {}
+        @connections[target] ||= []
+        @connections << connection
+      end
+
+      def self.get(target)
+        @connections ||= {}
+        @connections[target] ||= []
+        @connections[target].shift
+      end
+
+      def self.inspect
+        @connections.inspect
+      end
+
+    end
+  end
+end

data/lib/wildcloud/router/client.rb

@@ -18,52 +18,72 @@ module Wildcloud
   module Router
     module Client
 
-      def initialize(proxy)
-        @proxy = proxy
+      def initialize(target)
+        @target = target
         @closed = false
-        @parser = Http::Parser.new(self)
-        @buffer = []
-        @time = Time.now
       end
 
-      def closed?
-        @closed
-      end
+      # EventMachine
 
       def post_init
-        send_line("#{@proxy.request_method} #{@proxy.request_url} HTTP/#{@proxy.request_version}")
-        @proxy.request_headers.each do |name, value|
-          send_line("#{name}: #{value}")
-        end
-        send_line('')
-        send_data(@proxy.buffer)
-        EventMachine.enable_proxy(@proxy, self)
+        @parser = Http::ResponseParser.new(self)
       end
 
       def receive_data(data)
+        @outbound += data.size
         @parser << data
       rescue Http::Parser::Error => error
         Router.logger.debug('Proxy client') { "Error #{error}" }
       end
 
+      def unbind
+        @parser = nil
+        @stop_time = Time.now
+        Router.monitor.request(@target, @stop_time - @proxy.start_time, @inbound, @outbound)
+        @closed = true
+        @proxy.close_connection(true) if @proxy and !@proxy.closed?
+      end
+
+      # HTTP parser
+
       def on_headers_complete(headers)
         @proxy.send_line("HTTP/#{@parser.http_version.join('.')} #{@parser.status_code} #{CODE[@parser.status_code]}")
         headers.each do |name, value|
           @proxy.send_line("#{name}: #{value}")
         end
         @proxy.send_line('')
-        EventMachine.enable_proxy(self, @proxy)
-      end
-
-      def unbind
-        @closed = true
-        @proxy.close_connection(true) if @proxy and !@proxy.closed?
       end
 
       def on_body(chunk)
         @proxy.send_data(chunk)
       end
 
+      def on_message_complete
+        close_connection
+      end
+
+      # Tools
+
+      def make_request(proxy, version, method, url, headers)
+        @proxy = proxy
+        @inbound = 0
+        @outbound = 0
+        send_line("#{method} #{url} HTTP/#{version}")
+        headers.each do |name, value|
+          send_line("#{name}: #{value}")
+        end
+        send_line('')
+      end
+
+      def send_data(data)
+        @inbound += data.size
+        super(data)
+      end
+
+      def closed?
+        @closed
+      end
+
       def send_line(data)
         send_data("#{data}\r\n")
       end

data/lib/wildcloud/router/configuration.rb

@@ -14,17 +14,19 @@
 require 'yaml'
 
 require 'wildcloud/router/logger'
+require 'wildcloud/configuration'
 
 module Wildcloud
   module Router
+
     def self.configuration
       return @configuration if @configuration
-      file = '/etc/wildcloud/router.yml'
-      unless File.exists?(file)
-        file = './router.yml'
+      config = Wildcloud::Configuration.load('router')
+      config.sources.each do |source|
+        self.logger.info('Configuration', "Loaded configuration from #{source}")
       end
-      Router.logger.info('Config') { "Loading from file #{file}" }
-      @configuration = YAML.load_file(file)
+      @configuration = config.configuration
     end
+
   end
 end

data/lib/wildcloud/router/core.rb

@@ -41,6 +41,7 @@ module Wildcloud
       def connect_amqp
         Router.logger.info('Core') { "Connecting to broker" }
         @amqp = AMQP.connect(Router.configuration["amqp"])
+        Router.logger_add_amqp(@amqp)
         @channel = AMQP::Channel.new(@amqp)
         # Communication infrastructure
         @topic = @channel.topic('wildcloud.router')
@@ -64,12 +65,12 @@ module Wildcloud
         @routes = data['routes']
       end
 
-      def parse_target(target)
-        target = target.split(':')
+      def parse_target(raw_target)
+        target = raw_target.split(':')
         if target.size == 1
-          { "socket" => target[0] }
+          { "socket" => target[0]}
         else
-          { "address" => target[0], "port" => target[1] }
+          { "address" => target[0], "port" => target[1]}
         end
       end
 

data/lib/wildcloud/router/logger.rb

@@ -27,12 +27,15 @@ module Wildcloud
         @logger = Wildcloud::Logger::Logger.new
         @logger.application = 'wildcloud.router'
         @logger.add(Wildcloud::Logger::Middleware::Console)
-        @logger.add(Wildcloud::Logger::Middleware::Json)
-        @topic = AMQP::Channel.new(Core.instance.amqp).topic('wildcloud.logger')
-        @logger.add(Wildcloud::Logger::Middleware::Amqp, :exchange => @topic, :routing_key => 'wildcloud.router')
       end
       @logger
     end
 
+    def self.logger_add_amqp(amqp)
+      logger.add(Wildcloud::Logger::Middleware::Json)
+      @topic = AMQP::Channel.new(amqp).topic('wildcloud.logger')
+      logger.add(Wildcloud::Logger::Middleware::Amqp, :exchange => @topic, :routing_key => 'wildcloud.router')
+    end
+
   end
 end

data/lib/wildcloud/router/monitor.rb

@@ -0,0 +1,52 @@
+module Wildcloud
+  module Router
+
+    def self.monitor
+      @monitor ||= Monitor.new
+    end
+
+    class Monitor
+
+      def initialize
+        @channel = AMQP::Channel.new(Core.instance.amqp)
+        @topic = @channel.topic('wildcloud.monitor')
+        @data = setup
+        EventMachine.add_periodic_timer(1, &method(:report))
+      end
+
+      def report
+        data, @data = @data, setup
+        puts data.inspect
+        @topic.publish(JSON.dump(data), :routing_key => 'router')
+      end
+
+      def setup
+        {
+            :published_at => Time.now.to_i,
+            :node => Router.configuration['node']['name'],
+            :count => 0,
+            :inbound => 0,
+            :outbound => 0,
+            :time => 0,
+            :target => {},
+        }
+      end
+
+      def request(target, time, inbound, outbound)
+        return unless target
+        target = "#{target['address']}:#{target['port']}"
+        @data[:count] += 1
+        @data[:inbound] += inbound
+        @data[:outbound] += outbound
+        @data[:time] += time
+        #@data[:target][target] ||= {:count => 0, :outbound => 0, :inbound => 0, :time => 0}
+        #@data[:target][target][:count] += 1
+        #@data[:target][target][:time] += time
+        #@data[:target][target][:inbound] += inbound
+        #@data[:target][target][:outbound] += outbound
+      end
+
+    end
+
+  end
+end

data/lib/wildcloud/router/proxy.rb

@@ -15,39 +15,27 @@
 require 'http/parser'
 
 require 'wildcloud/router/client'
+require 'wildcloud/router/monitor'
 
 module Wildcloud
   module Router
     module Proxy
 
-      attr_reader :core, :request_headers, :buffer, :request_version, :request_method, :request_url
+      attr_reader :core, :start_time
 
       def initialize(core)
         @core = core
-        @parser = Http::Parser.new(self)
-        @buffer = []
         @closed = false
-        @time = Time.now
-        @request_headers = nil
       end
 
-      def post_init
-      end
+      # EventMachine
 
-      def closed?
-        @closed
+      def post_init
       end
 
       def receive_data(data)
-        offset = @parser << data
-        if @request_headers
-          @buffer = data[offset..-1]
-          if @target["socket"]
-            @client = EventMachine.connect(@target["socket"], Router::Client, self)
-          else
-            @client = EventMachine.connect(@target["address"], @target["port"], Router::Client, self)
-          end
-        end
+        @parser ||= Http::RequestParser.new(self)
+        @parser << data
       rescue HTTP::Parser::Error => error
         Router.logger.debug('Proxy') { "Error during parsing #{error.message}" }
       end
@@ -57,15 +45,36 @@ module Wildcloud
         @client.close_connection(true) if @client and !@client.closed?
       end
 
+      # HTTP parser
+
+      def on_message_begin
+        @start_time = Time.now
+      end
+
       def on_headers_complete(headers)
-        @request_headers = headers
-        @request_version = @parser.http_version.join('.')
-        @request_method = @parser.http_method
-        @request_url = @parser.request_url
-        return bad_request unless @request_headers['Host']
-        @target = @core.resolve(@request_headers['Host'])
-        return bad_request unless @target
-        :stop
+        return bad_request unless headers['Host']
+        target = @core.resolve(headers['Host'])
+        return bad_request unless target
+        if target["socket"]
+          @client = EventMachine.connect(target["socket"], Router::Client, target)
+        else
+          @client = EventMachine.connect(target["address"], target["port"], Router::Client, target)
+        end
+        @client.make_request(self, @parser.http_version.join('.'), @parser.http_method, @parser.request_url, headers)
+      end
+
+      def on_body(chunk)
+        @client.send_data(chunk)
+      end
+
+      def on_message_complete
+        @parser = nil
+      end
+
+      # Tools
+
+      def closed?
+        @closed
       end
 
       def bad_request
@@ -73,10 +82,6 @@ module Wildcloud
         :stop
       end
 
-      def on_body(chunk)
-        @buffer << chunk
-      end
-
       def send_line(data)
         send_data("#{data}\r\n")
       end

data/lib/wildcloud/router/version.rb

@@ -14,6 +14,6 @@
 
 module Wildcloud
   module Router
-    VERSION = '0.0.2' unless const_defined?(:VERSION)
+    VERSION = '0.0.3' unless const_defined?(:VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcloud-router
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2161097640 !ruby/object:Gem::Requirement
+  requirement: &2153214940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *2161097640
+  version_requirements: *2153214940
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &2161097140 !ruby/object:Gem::Requirement
+  requirement: &2153214200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2161097140
+  version_requirements: *2153214200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161096640 !ruby/object:Gem::Requirement
+  requirement: &2153213680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2161096640
+  version_requirements: *2153213680
 - !ruby/object:Gem::Dependency
   name: wildcloud-logger
-  requirement: &2161096160 !ruby/object:Gem::Requirement
+  requirement: &2153213220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,7 +54,7 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161096160
+  version_requirements: *2153213220
 description: Routes requests across the platform
 email:
 - marek@jelen.biz
@@ -64,10 +64,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/wildcloud-router
+- lib/wildcloud/router/cache.rb
 - lib/wildcloud/router/client.rb
 - lib/wildcloud/router/configuration.rb
 - lib/wildcloud/router/core.rb
 - lib/wildcloud/router/logger.rb
+- lib/wildcloud/router/monitor.rb
 - lib/wildcloud/router/proxy.rb
 - lib/wildcloud/router/server.rb
 - lib/wildcloud/router/version.rb