Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for xip.io #90

Merged
merged 1 commit into from
Jun 26, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/invoker/power/balancer.rb
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ def post_init
class Balancer
attr_accessor :connection, :http_parser, :session, :protocol
DEV_MATCH_REGEX = /([\w-]+)\.dev(\:\d+)?$/
XIP_IO_MATCH_REGEX = /([\w-]+)\.\d+\.\d+\.\d+\.\d+\.xip\.io(\:\d+)?$/

def self.run(options = {})
start_http_proxy(InvokerHttpProxy, 'http', options)
@@ -101,7 +102,7 @@ def frontend_disconnect(backend, name)
end

def extract_host_from_domain(host)
host.match(DEV_MATCH_REGEX)
host.match(DEV_MATCH_REGEX) || host.match(XIP_IO_MATCH_REGEX)
end

private
42 changes: 38 additions & 4 deletions spec/invoker/power/balancer_spec.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require 'spec_helper'

describe Invoker::Power::Balancer do
context "matching domain part of incoming request" do
before do
@balancer = Invoker::Power::Balancer.new(mock("connection"), "http")
end
before do
@balancer = Invoker::Power::Balancer.new(mock("connection"), "http")
end

context "matching domain part of incoming request" do
it "should do foo.dev match" do
match = @balancer.extract_host_from_domain("foo.dev")
expect(match).to_not be_nil
@@ -38,4 +38,38 @@
expect(matching_string).to eq("hello-world")
end
end

context "matching domain part of incoming request using xip.io" do
it "should do foo.10.0.0.1.xip.io match" do
match = @balancer.extract_host_from_domain("foo.10.0.0.1.xip.io")
expect(match).to_not be_nil

matching_string = match[1]
expect(matching_string).to eq("foo")
end

it "should match foo.10.0.0.1.xip.io:1080" do
match = @balancer.extract_host_from_domain("foo.10.0.0.1.xip.io:1080")
expect(match).to_not be_nil

matching_string = match[1]
expect(matching_string).to eq("foo")
end

it "should match emacs.bar.10.0.0.1.xip.io" do
match = @balancer.extract_host_from_domain("emacs.bar.10.0.0.1.xip.io")
expect(match).to_not be_nil

matching_string = match[1]
expect(matching_string).to eq("bar")
end

it "should match hello-world.10.0.0.1.xip.io" do
match = @balancer.extract_host_from_domain("hello-world.10.0.0.1.xip.io")
expect(match).to_not be_nil

matching_string = match[1]
expect(matching_string).to eq("hello-world")
end
end
end