sockd 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0a446b2a9f0577de1dc8f750e0d49f913490f12
-  data.tar.gz: 0e6d76f5c7d9443182ed00888445be74080b1067
+  metadata.gz: f68f3a2116561ffd7fc5101c67fda661e884e78a
+  data.tar.gz: 46ebcbfd7636d55685c63b7de5a3afe983cbd6e1
 SHA512:
-  metadata.gz: cee27594593028ab2417be7cf4898fc3f6be8b0087bc54fe97a3dae408b212fc986ca3777efcba4f65ba88d0e493ecdffeb97fbbd88851e8fe61402cef0e6d83
-  data.tar.gz: c1c8c2f2ead721ba3b756802626ead69d5a3262931cd0255f3de4072a13b1cdab8cff3d4a4debf6516f10bb51ecfb4e78592a1684dc1329004367b178d01fc19
+  metadata.gz: 0e6b7cc336524b6b8a0a83598be660fd361d53c704c496cec8637f57526c1b48c5fbebd1a3201722874ed45673bfdcd5ff6a4e662c20df7d860a6080721c6be5
+  data.tar.gz: e04246c93263fd5f5571d33ab9ed87237f50c73c2c18cb2c88fe2bd3576926fa907ba183e34390673e1343a64d7b83286f21c20c28796c0fb942246642217d82

data/lib/sockd/runner.rb

@@ -1,5 +1,6 @@
 require "logger"
 require "socket"
+require "timeout"
 require "fileutils"
 require "sockd/errors"
 
@@ -62,10 +63,10 @@ module Sockd
     # define our socket handler by providing a block, or trigger the callback
     # with the provided message
     # @runner.handle { |msg| if msg == 'foo' then return 'bar' ... }
-    def handle(message = nil, &block)
+    def handle(message = nil, socket = nil, &block)
       return self if block_given? && @handle = block
       @handle || (raise SockdError, "No message handler provided.")
-      @handle.call(message, self)
+      @handle.call(message, socket)
     end
 
     # call one of start, stop, restart, or send
@@ -98,6 +99,7 @@ module Sockd
       on_interrupt do |signal|
         log "#{signal} received, shutting down..."
         teardown
+        cleanup
         exit 130
       end
 
@@ -157,7 +159,12 @@ module Sockd
           begin
             # wait for input
             if IO.select([sock], nil, nil, 2.0)
-              handle sock
+              msg = sock.recv(256, Socket::MSG_PEEK)
+              if msg.chomp == "ping"
+                sock.print "pong\r\n"
+              else
+                handle msg, sock
+              end
             else
               log "connection timed out"
             end
@@ -172,7 +179,25 @@ module Sockd
     # return a UNIXServer or TCPServer instance depending on config
     def server(&block)
       if options[:socket]
-        UNIXServer.open(options[:socket], &block)
+        begin
+          UNIXServer.open(options[:socket], &block)
+        rescue Errno::EADDRINUSE
+          begin
+            Timeout.timeout(5) do
+              UNIXSocket.open(options[:socket]) do |sock|
+                sock.write "ping\r\n"
+                if sock.gets.chomp == "pong"
+                  raise ProcError, "socket #{options[:socket]} already in use by another instance of #{name}"
+                end
+              end
+            end
+            raise ProcError, "socket #{options[:socket]} already in use by another process"
+          rescue Errno::ECONNREFUSED, Timeout::Error
+            log "socket is stale, reopening"
+            cleanup
+            UNIXServer.open(options[:socket], &block)
+          end
+        end
       else
         TCPServer.open(options[:host], options[:port], &block)
       end
@@ -193,6 +218,15 @@ module Sockd
       raise ProcError, "unable to open socket: #{sock} (check permissions)"
     end
 
+    # clean up UNIXSocket upon termination
+    def cleanup
+      if options[:socket] && File.exists?(options[:socket])
+        File.delete(options[:socket])
+      end
+    rescue StandardError
+      raise ProcError, "unable to unlink socket: #{options[:socket]} (check permissions)"
+    end
+
     # handle process termination signals
     def on_interrupt(&block)
       trap("INT")  { yield "SIGINT" }

data/lib/sockd/version.rb

@@ -1,3 +1,3 @@
 module Sockd
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sockd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Greiling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler