easy-serve 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0143fc9b7f2050d38052203db45fd4bd0b01f5bc
-  data.tar.gz: 1fc4f8df85484e182ea5e914efe4ff7d8f07d3ca
+  metadata.gz: affa8e536ee5d6c7d9b703a45267bcc7fec96535
+  data.tar.gz: d389e400e0e5408ac08400cfd61661befeaaf514
 SHA512:
-  metadata.gz: f1ac81b1578caa68259a1b06606f1dd42243d3817cfb554df4f57b7d7343680ad711a32807918d3d8249e930482f75735ebda5f8d952c3cf71bb428186d1a524
-  data.tar.gz: c8ebb5183a057d4fb7a3ff036796232151b4334028c7bfc0c9b9ee7a7914c92e43afe48da8929ae11929de0ae607078bea9db9d7bbac9e6f1bbc6f3038695d99
+  metadata.gz: 5f552e68ca9612ebaacbef58ce31395b7da8121a6753855aebb3bfac58bf07fb435f45dc0f4184395a02d3c9e8590249785307b79f603472e29adaa4f97b0f6f
+  data.tar.gz: 07aedd1e1b46b0ce875e5dee6cc37220e8e90ca929ebf6bff445a7e6f234733ad07b81416a9b89d14dd04be703bc728599ac18d73eef1762bdc0f00196cf44d1

data/examples/passive.rb

@@ -0,0 +1,39 @@
+require 'easy-serve'
+Thread.abort_on_exception = true
+
+EasyServe.start do |ez|
+  log = ez.log
+  log.level = Logger::DEBUG
+  log.formatter = nil if $VERBOSE
+  log.debug {"starting servers"}
+    
+  ez.start_servers do
+    ez.server "simple-server", :unix do |svr|
+      Thread.new do
+        loop do
+          conn = svr.accept
+          conn.write "hello from #{log.progname}"
+          conn.close_write
+          log.info conn.read
+          conn.close
+        end
+      end
+    end
+  end
+  
+  ez.client "simple-server", passive: true do |conn|
+    log.progname = "client 1"
+    log.info conn.read
+    conn.write "hello from #{log.progname}, pid = #$$; sleeping..."
+    conn.close_write
+    sleep
+  end
+  
+  sleep 0.1
+  
+  ez.client "simple-server" do |conn|
+    log.progname = "client 2"
+    log.info conn.read
+    conn.write "hello from #{log.progname}, pid = #$$"
+  end
+end

data/lib/easy-serve.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'fileutils'
 
 class EasyServe
-  VERSION = "0.2"
+  VERSION = "0.3"
 
   class Server
     attr_reader :name, :pid, :addr
@@ -37,6 +37,7 @@ class EasyServe
   attr_accessor :log
   attr_accessor :servers
   attr_reader :clients
+  attr_reader :passive_clients
   attr_reader :servers_file
   attr_reader :interactive
   
@@ -55,6 +56,7 @@ class EasyServe
     @interactive = opts[:interactive]
     @log = opts[:log] || self.class.null_logger
     @clients = [] # pid
+    @passive_clients = [] # pid
     @owner = false
     @servers = nil # name => Server
     
@@ -90,7 +92,21 @@ class EasyServe
 
     clients.each do |pid|
       log.debug {"waiting for client pid=#{pid} to stop"}
-      Process.waitpid pid
+      begin
+        Process.waitpid pid
+      rescue Errno::ECHILD
+        log.debug {"client pid=#{pid} was already waited for"}
+      end
+    end
+
+    passive_clients.each do |pid|
+      log.debug {"stopping client pid=#{pid}"}
+      Process.kill("TERM", pid)
+      begin
+        Process.waitpid pid
+      rescue Errno::ECHILD
+        log.debug {"client pid=#{pid} was already waited for"}
+      end
     end
     
     if @owner
@@ -220,12 +236,15 @@ class EasyServe
     end
   end
 
-  def client *server_names
-    clients << fork do
+  # A passive client may be stopped after all active clients exit.
+  def client *server_names, passive: false
+    c = fork do
       conns = server_names.map {|sn| socket_for(*servers[sn].addr)}
       yield(*conns) if block_given?
       no_interrupt_if_interactive
     end
+    (passive ? passive_clients : clients) << c
+    c
   end
   
   def local *server_names

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Framework for starting tcp/unix servers and connected clients under one
   parent process.
@@ -25,6 +25,7 @@ files:
 - examples/simple.rb
 - examples/multi.rb
 - examples/remote.rb
+- examples/passive.rb
 homepage: https://github.com/vjoel/easy-serve
 licenses:
 - BSD