softwear-lib 2.1.7 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 686f7869e707c46dcb3e00e096f5d9a9fbeca06b
-  data.tar.gz: 33f93003887efb1bb16f1001ad5e018b061562bf
+  metadata.gz: 26254fb662076fc8e52a5f9bee3736d645699c65
+  data.tar.gz: 64b88c6e858c9000dd9806a8e83af67f8749faa8
 SHA512:
-  metadata.gz: 0209fba37cbee0ce9226ae95dd83014acbe4bf45ef3e3d8d21f15e06c00c54297d585ef62c2dc24ee02a04feff0b083440ed92f47492ab27450598706fc260f1
-  data.tar.gz: a43acf8622808a23ac6e52196156c7fcaff8074cba848864cbbe30eec89339cf7ff504ac8d7eaca0ad325f171eb741d7ad061d222971ea118ad7afbe5db1f14e
+  metadata.gz: 0c766b1ed256367e2c1f58ef2d8dcc45f46164c268feb0c10169724cb0509c187b69b646b822c8765120871098f4629f8f1104d7d8a1d655aa2a724f35bfd133
+  data.tar.gz: 24be483b5caa64e24e39800a41a08aeee07d2914a76e1ab99041e1dae3256f5948f6887079f59c788870e0b33ae7498634bac0331746d0a5653910975d949518

data/lib/softwear/auth/standard_model.rb

@@ -1,3 +1,5 @@
+require 'rbczmq'
+
 module Softwear
   module Auth
     class StandardModel
@@ -170,8 +172,22 @@ module Softwear
           end
         end
 
+        def zmq
+          $zmq_context ||= ZMQ::Context.new
+        end
+
         def default_socket
-          @default_socket ||= TCPSocket.open(auth_server_host, auth_server_port)
+          if existing = Thread.current[:auth_socket]
+            return existing
+          end
+
+          Thread.current[:auth_socket] = zmq.connect(
+            :REQ, "tcp://#{auth_server_host}:#{auth_server_port}"
+          )
+        end
+
+        def destroy_default_socket!
+          Thread.current[:auth_socket].try(:destroy) rescue nil
         end
 
         # ====================
@@ -180,18 +196,12 @@ module Softwear
         # ====================
         def raw_query(message)
           begin
-            default_socket.puts message
-            default_socket.flush
-
-          rescue Errno::EPIPE => e
-            @default_socket = TCPSocket.open(auth_server_host, auth_server_port)
-            @default_socket.puts message
+            default_socket.send message
           end
 
-          response = default_socket.gets.try(:chomp)
+          response = default_socket.recv.try(:chomp)
           if response.nil?
-            @default_socket.close rescue nil
-            @default_socket = nil
+            destroy_default_socket!
             return raw_query(message)
           end
           response

data/lib/softwear/library/light_server.rb

@@ -0,0 +1,121 @@
+require 'rbczmq'
+
+def split(string, limit = nil)
+  string.split(/\s+/, limit)
+end
+
+def report_error(rep, whole_command, error)
+  $stderr.puts "=== ERROR WHILE PROCESSING THE COMMAND \"#{whole_command}\" ===\n"\
+    "#{error.class.name}: #{error.message}\n#{error.backtrace.join("\n")}"
+
+  begin
+    rep.send "sorry" if rep
+  rescue StandardError => e
+    $stderr.puts "(could not send 'sorry' message: \"#{e.class} #{e.message}\")"
+  end
+end
+
+def dev_log(*a)
+  $stdout.puts(*a) #if Rails.env.development?
+end
+
+def log(*a)
+  $stdout.puts(*a) #unless Rails.env.test?
+end
+
+# ==== Send Format: =======
+# One line strings: "#{command} #{arg1} #{arg2} #{etc}"
+# The last argument, depending on the command, may contain spaces (but usually does not need to)
+# =========================
+# === Receive Format: =====
+# Usually one string, like "yes", or "no".
+# Returns "denied"  if an unauthorized command was attempted.
+# Returns "invalid" if an invalid command was attempted.
+# Returns "sorry"   if an error was raised while processing the command.
+# Can be a json argument, often following "yes ".
+# =========================
+def start_server!(*args)
+  log "Connecting...!"
+  
+  if args.size > 1
+    port = args.first
+  else
+    port = ENV['port'] || ENV['PORT'] || 2900
+  end
+  address = ENV['SOCKET_ADDR'] || "tcp://*"
+
+  if address =~ /:$/
+    socket_address = address
+  else
+    socket_address = "#{address}:#{port}"
+  end
+
+  ctx = ZMQ::Context.new
+  rep = ctx.bind(:REP, socket_address)
+
+  log "Ready! Using \"#{ActiveRecord::Base.connection.current_database}\" database"
+
+  commands = args.last
+
+  loop do
+    begin
+      loop do
+        line_in = rep.recv
+        raise "Got nil response (ZMQ REP/REQ out of sync?)" if line_in.nil?
+        command, rest_of_command = split(line_in, 2)
+
+        before = Time.now
+        begin
+          command = commands[command.downcase.to_sym]
+
+          if command.nil?
+            log "Received invalid command: \"#{line_in}\""
+          else
+            dev_log "<== #{line_in}"
+            ActiveRecord::Base.connection_pool.with_connection do
+
+              # The ZMQ socket requires that a reply be send after every
+              # message -- so we pass a lambda for the client code to
+              # call to send a message and make sure it only happens
+              # once.
+              replied = false
+              reply = lambda do |msg|
+                if replied
+                  raise "Reply sent twice"
+                else
+                  rep.send(msg)
+                  replied = true
+                end
+              end
+              command.call(reply, rest_of_command)
+
+              if !replied
+                rep.send "noreply"
+              end
+
+            end
+          end
+
+        rescue StandardError => e
+          report_error(rep, line_in, e)
+        rescue Exception => e
+          report_error(rep, line_in, e)
+          break
+        end
+        after = Time.now
+
+        ms = (after - before) * 1000
+        dev_log %[(#{'%.2f' % ms}ms)]
+        dev_log ""
+      end
+
+    rescue StandardError => error
+      $stderr.puts "=== ERROR -- RESTARTING SERVER ===\n"\
+        "#{error.class.name}: #{error.message}\n#{error.backtrace.join("\n")}"
+
+      rep.destroy
+      log "Reconnecting...!"
+      rep = ctx.bind(:REP, socket_address)
+    end
+  end
+end

data/lib/softwear/library/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Library
-    VERSION = "2.1.7"
+    VERSION = "3.0.0"
   end
 end

data/softwear-lib.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.2.0"
 
   spec.add_dependency "activesupport", "~> 4.2.1"
+  spec.add_dependency "rbczmq"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 3.0.0
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: rbczmq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - nigel@annarbortees.com
@@ -113,8 +127,8 @@ files:
 - lib/softwear/library/capistrano.rb
 - lib/softwear/library/controller_authentication.rb
 - lib/softwear/library/enqueue.rb
+- lib/softwear/library/light_server.rb
 - lib/softwear/library/spec.rb
-- lib/softwear/library/tcp_server.rb
 - lib/softwear/library/version.rb
 - softwear-lib.gemspec
 - spec/spec_helper.rb

data/lib/softwear/library/tcp_server.rb

@@ -1,112 +0,0 @@
-def split(string, limit = nil)
-  string.split(/\s+/, limit)
-end
-
-def report_error(client, whole_command, error)
-  $stderr.puts "=== ERROR WHILE PROCESSING THE COMMAND \"#{whole_command}\" ===\n"\
-    "#{error.class.name}: #{error.message}\n#{error.backtrace.join("\n")}"
-  client.puts "sorry"
-end
-
-def dev_log(*a)
-  $stdout.puts(*a) if Rails.env.development?
-end
-
-def log(*a)
-  $stdout.puts(*a) unless Rails.env.test?
-end
-
-# ==== Send Format: =======
-# One line strings: "#{command} #{arg1} #{arg2} #{etc}"
-# The last argument, depending on the command, may contain spaces (but usually does not need to)
-# =========================
-# === Receive Format: =====
-# Usually one string, like "yes", or "no".
-# Returns "denied"  if an unauthorized command was attempted.
-# Returns "invalid" if an invalid command was attempted.
-# Returns "sorry"   if an error was raised while processing the command.
-# Can be a json argument, often following "yes ".
-# =========================
-def address_of(socket)
-  _family, port, name, host = socket.addr
-  if host == name
-    "#{host}:#{port}"
-  else
-    "#{name}(#{host}):#{port}"
-  end
-end
-
-def start_server!(*args)
-  log "Connecting...!"
-  
-  if args.size > 1
-    port = args.first
-  else
-    port = ENV['port'] || ENV['PORT'] || 2900
-  end
-
-  server = TCPServer.new port
-  log "Ready! Using \"#{ActiveRecord::Base.connection.current_database}\" database"
-
-  client_count = 0
-  commands = args.last
-
-  loop do
-    Thread.start(server.accept) do |client|
-      begin
-        client.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      rescue Exception => e
-        puts "Couldn't set TCP_NODELAY"
-      end
-
-      client_count += 1
-      dev_log "New client! ##{client_count} #{address_of client}"
-
-      if Rails.env.development?
-        response_logger = Module.new do
-          def puts(s)
-            $stdout.puts "==> #{s}"
-            super
-          end
-        end
-        client.singleton_class.send :include, response_logger
-      end
-
-      while line_in = client.gets.chomp
-        log "Processing \"#{line_in}\"" if Rails.env.test?
-
-        command, rest_of_command = split(line_in, 2)
-
-        before = Time.now
-        begin
-          command = commands[command.downcase.to_sym]
-
-          if command.nil?
-            log "SOMEONE attempted invalid command: \"#{line_in}\""
-          else
-            dev_log "<== #{line_in}"
-            ActiveRecord::Base.connection_pool.with_connection do
-              command.call(client, rest_of_command)
-              client.flush
-            end
-          end
-
-        rescue StandardError => e
-          report_error(client, line_in, e)
-        rescue Exception => e
-          report_error(client, line_in, e)
-          break
-        end
-        after = Time.now
-
-        ms = (after - before) * 1000
-        dev_log %((#{'%.2f' % ms}ms) from #{address_of(client)})
-        dev_log ""
-      end
-
-      client_count -= 1
-      client.close rescue nil
-      dev_log "Client disconnected. #{address_of client}"
-    end
-  end
-end