goat 0.3.19 → 0.3.21

data/bin/channel-srv

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'eventmachine'
 require 'json'
+require 'optparse'
 require 'thin'
 require 'rack'
 
@@ -141,6 +142,27 @@ module Goat
   end
 end
 
+$host = '0.0.0.0'
+$port = 8050
+
+$statesrv_host = '127.0.0.1'
+$statesrv_port = 8011
+
+def usage
+  $stderr.puts <<-EOH
+#{__FILE__} [-p port] [-H host] [-s statesrv_port] [-S statesrv_host]
+  EOH
+end
+
+OptionParser.new do |opts|
+  opts.on('-pMANDATORY', Integer) {|p| $port = r}
+  opts.on('-HMANDATORY', String) {|h| $host = h}
+  opts.on('-SMANDATORY', String) {|h| $statesrv_host = h}
+  opts.on('-sMANDATORY', Integer) {|p| $statesrv_port = p}
+  opts.on('-v') {} # suppress optparse wanting to use -v as version
+  opts.on('-h') {usage; exit 1}
+end.parse!(ARGV)
+
 app = Rack::Builder.app do |builder|
   use Rack::CommonLogger
   use Rack::ShowExceptions
@@ -149,6 +171,6 @@ end
 
 Goat.announce_launch('channel-srv')
 EM.run do
-  Goat::ChannelSrv::ChannelStateConnection.connect
-  Rack::Handler::Thin.run(app, :Port => (ARGV.first ? ARGV.first.to_i : 8050))
+  Goat::ChannelSrv::ChannelStateConnection.connect($statesrv_host, $statesrv_port)
+  Rack::Handler::Thin.run(app, :Host => $host, :Port => $port)
 end

data/bin/state-srv

@@ -344,7 +344,7 @@ module Goat
 
       def run
         @registry.connected_pages.each do |pgid|
-          if @registry.last_connected_delta(pgid) > 300
+          if @registry.last_connected_delta(pgid) > (60 * 60)
             Goat.logd "Deleting page #{pgid}"
             @registry.delete_page(pgid)
           end
@@ -401,6 +401,12 @@ end
 $host = '127.0.0.1'
 $port = 8011
 
+def usage
+  $stderr.puts <<-EOH
+#{__FILE__} [-p port] [-H host]
+  EOH
+end
+
 OptionParser.new do |opts|
   # this is the second jankiest optparser I've ever used
   opts.on('-pMANDATORY', Integer) {|r| $port = r}

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.19'
+  s.version = '0.3.21'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat/state-srv.rb

@@ -2,7 +2,8 @@ module Goat
   module StateSrvClient
     def self.configure(opts={})
       # TODO implement fully
-      EM.next_tick { StateSrvConnection.connect }
+      EM.next_tick { StateSrvConnection.connect(opts[:host] || '127.0.0.1',
+                                                opts[:port] || 8011) }
     end
 
     def self.send_message(type, m, sync=false)
@@ -46,12 +47,17 @@ module Goat
     def self.connection=(c); @@connection = c; end
     def self.connected?; @@connection != nil; end
 
-    def self.connect(host='127.0.0.1', port=8011, &dlg)
+    def self.connect(host, port, &dlg)
       @host = host
       @port = port
       EM.connect(host, port, self)
     end
 
+    def self.reconnect
+      raise 'Reconnect called before connection made' if @host.nil? || @port.nil?
+      self.connect(@host, @port)
+    end
+
     def self.send_message_sync(msg)
       s = TCPSocket.open(@host, @port)
       s.write(msg.to_json + "\n")
@@ -113,7 +119,7 @@ module Goat
       end
 
       StateSrvConnection.connection = nil
-      EM.add_timer(5) { self.class.connect }
+      EM.add_timer(5) { self.class.reconnect }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 3
-  - 19
-  version: 0.3.19
+  - 21
+  version: 0.3.21
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +00:00
+date: 2010-12-08 00:00:00 +00:00
 default_executable: 
 dependencies: []