lib/firehose/cli.rb in firehose-0.0.16 vs lib/firehose/cli.rb in firehose-0.1.0

@@ -6,30 +6,18 @@
     desc "server", "starts the firehose server"
     method_option :port, :type => :numeric, :default => Firehose::Default::URI.port, :required => true, :aliases => '-p'
     method_option :host, :type => :string, :default => '0.0.0.0', :required => true, :aliases => '-h'
 
     def server
-      broker = Firehose::Broker.new
-
       server = Thin::Server.new(options[:host], options[:port]) do
-        # TODO move this into a socket... this is really janky, but I need to to troubleshoot
-        # connection reference issues. I'd like to have this ancillary stuff accessiable via
-        # a different port or even a socket.
-        map '/_firehose/stats' do
-          run Proc.new {
-            [200, {'Content-Type' => 'text/plain'}, [broker.stats.inspect]]
-          }
-        end
-
-        map '/' do
-          run Firehose::Rack::App.new(broker)
-        end
+        run Firehose::Rack::App.new
       end
 
       begin
         server.start!
-      rescue AMQP::TCPConnectionFailed => e
-        Firehose.logger.error "Unable to connect to AMQP, are you sure it's running?"
+      rescue RuntimeError
+        Firehose.logger.error "Unable to connect to Redis, are you sure it's running?"
+        raise
       end
     end
   end
 end
\ No newline at end of file