Merge branch 'rack-server' of github.com:lgierth/fnordmetric - closes #42 (9da22695) · Commits · github_fork / Clip

Gemfile

+0 −2

Original line number	Diff line number	Diff line
		@@ -3,5 +3,3 @@ source :rubygems
		gemspec

		gem "yajl-ruby", :git => "git://github.com/brianmario/yajl-ruby.git"

		gem "rake"

+10 −7

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ require "active_support/core_ext"
		require 'yajl'
		require 'sinatra/base'
		require 'haml'
		require 'thin'
		require 'rack/server'

		require "fnordmetric/version"

		@@ -28,6 +28,7 @@ module FnordMetric

		opts[:inbound_stream] \|\|= ["0.0.0.0", "1337"]
		opts[:web_interface] \|\|= ["0.0.0.0", "4242"]
		opts[:web_interface_server] \|\|= "thin"

		opts[:start_worker] \|\|= true
		opts[:print_stats] \|\|= 3
		@@ -53,14 +54,16 @@ module FnordMetric
		app = embedded(opts)

		if opts[:web_interface]
		begin
		Thin::Server.start(*opts[:web_interface], app)
		log "listening on http##{opts[:web_interface].join(":")}"
		rescue Exception => e
		log "cant start FnordMetric::App. port in use?"
		end
		server = opts[:web_interface_server].downcase
		unless ["thin", "hatetepe"].include? server
		raise "Need an EventMachine webserver, but #{server} isn't"
		end

		host, port = *opts[:web_interface]
		Rack::Server.start :app => app, :server => server,
		:Host => host, :Port => port
		log "listening on http://#{host}:#{port}"
		end
		end
		end