DanaDanger-equity 0.2 → 0.3

data/bin/equity

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-#  equity 0.2 - simple queueing software load balancer
+#  equity 0.3 - simple queueing software load balancer
 #
 #  Usage: equity [-d] <listen-port> [<node-address>:]<node-port> ...
 #
@@ -26,7 +26,7 @@ end
 $debugging = !!ARGV.delete('-d')
 
 if ARGV.length < 2
-  STDERR.puts 'equity 0.2'
+  STDERR.puts 'equity 0.3'
   STDERR.puts 'Usage: equity [-d] <listen-port> [<node-address>:]<node-port> ...'
   STDERR.print "\n"
   STDERR.puts 'The -d option turns on debug mode. Equity will remain in the foreground and'

data/bin/equityctl

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+#
+#  equityctl - management client for equity
+#
+#  Usage: equityctl [<host>:]<port> <command>
+#
+#  The host defaults to localhost.
+#
+#  Command    Description
+#  status     Displays each node's address, port, connection status, and
+#             connection counter.
+#
+#  Equity uses UDP packets to send control information, so all of UDP's caveats
+#  apply to equityctl.
+#
+
+require 'equity/controller'
+
+# Process arguments.
+if ARGV.length != 2
+  STDERR.puts 'Usage: equityctl [<host>:]<port> <command>'
+  STDERR.print "\n"
+  STDERR.puts 'The host defaults to localhost.'
+  STDERR.print "\n"
+  STDERR.puts 'Command    Description'
+  STDERR.puts 'status     Displays each node\'s address, port, connection status, and'
+  STDERR.puts '           connection counter.'
+  exit(64)
+end
+
+address, port = ARGV.shift.split(':', 2)
+if port.nil?
+  port = address
+  address = 'localhost'
+end
+
+command = ARGV.shift
+
+# Send command.
+class NoResponseError < Exception; end
+
+controller = Equity::Controller.new(address, port.to_i)
+begin
+  case command
+  when 'status'
+    nodes = controller.node_status || raise(NoResponseError)
+    nodes.each do |node|
+      puts "#{node} #{node.connected? ? 'C' : '-'} #{node.counter}"
+    end
+  else
+    STDERR.puts "Unrecognized command: #{command}"
+    STDERR.puts 'Run equityctl with no arguments for a list of commands.'
+    exit(64)
+  end
+rescue NoResponseError
+  STDERR.puts "No response from #{address}:#{port}"
+  exit(1)
+end

data/lib/equity/controller.rb

@@ -0,0 +1,58 @@
+require 'socket'
+require 'dl/import'
+require 'equity/manager'
+require 'equity/node'
+
+module Equity
+  class Controller
+    def initialize(host, port)
+      @host = host.dup
+      @port = port.to_i
+      @socket = UDPSocket.new
+    end
+    
+    def node_status
+      reply = send(Manager::CMD_NODE_STATUS)
+      return nil unless reply
+      
+      nodes = []
+      count = reply.slice!(0, 1)[0]
+      count.times do
+        length, connected, counter, port = reply.slice!(0, 9).unpack('nCNn')
+        address = reply.slice!(0, length - 9)
+        node = Node::Static.new(address, port)
+        node.connected = (connected != 0)
+        node.counter = counter
+        nodes << node
+      end
+      nodes
+    end
+    
+    module Alarm
+      extend DL::Importable
+      if RUBY_PLATFORM =~ /darwin/
+        so_ext = 'dylib'
+      else
+        so_ext = 'so'
+      end
+      dlload "libc.#{so_ext}"
+      extern "unsigned int alarm(unsigned int)"
+    end
+  
+  private
+    
+    def send(message)
+      @socket.send(message, 0, @host, @port)
+      begin
+        trap('ALRM') { raise Errno::EINTR }
+        Alarm.alarm(15)
+        reply, address = @socket.recvfrom(1024)
+      rescue Errno::EINTR
+        reply = nil
+      end
+      Alarm.alarm(0)
+      reply
+    end
+    
+  end
+end

data/lib/equity/manager.rb

@@ -31,7 +31,7 @@ module Equity
       message = [@nodes.length].pack('C')
       @nodes.each do |node|
         message += [
-          5 + node.address.length,
+          9 + node.address.length,
           (node.connected? ? 1 : 0),
           node.counter,
           node.port

data/lib/equity/node.rb

@@ -52,5 +52,29 @@ module Equity
     def to_s
       "#{@address}:#{@port}"
     end
+    
+    class Static < Node
+      attr_writer :counter
+      
+      def connected=(bool)
+        @client = bool
+      end
+      
+      def connect(client)
+        raise(RuntimeError, 'static nodes cannot be connected')
+      end
+      
+      def disconnect
+        raise(RuntimeError, 'static nodes cannot be disconnected')
+      end
+      
+      def sockets
+        []
+      end
+      
+      def owns_socket?(socket)
+        false
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DanaDanger-equity
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - DanaDanger
@@ -17,12 +17,15 @@ description:
 email: 
 executables: 
 - equity
+- equityctl
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/equity
+- bin/equityctl
+- lib/equity/controller.rb
 - lib/equity/manager.rb
 - lib/equity/node.rb
 - lib/equity/socket_pairing.rb