zas-client 0.1.0 → 0.1.1

data/lib/zas/client.rb

@@ -18,22 +18,15 @@ module Zas
     # Public: Initialize the client with the given configuration.
     #
     # config - Configuration spec for the client.
+    #
+    # Important note: when you construct the Zas::Client it is your responsibility to shut
+    # down cleanly. To do this call client.shutdown when your consumer exits.
     def initialize(config=ClientConfiguration.new)
       self.host = config.host
       self.port = config.port
       self.timeout = config.timeout
       self.logger = config.logger
       self.context = ZMQ::Context.new
-
-      Signal.trap(:INT) { 
-        begin
-          puts "Trapped INT in Zas client"
-          disconnect
-          close
-        rescue => e
-          puts "Error while trying to shut down zas client: #{e.message}"
-        end
-      }
     end
 
     # Public: Authenticate the given credentials.
@@ -67,20 +60,40 @@ module Zas
 
     # Public: Disconnect the socket.
     def disconnect
-      if socket
-        logger.debug "Closing socket #{socket.inspect}"
-        socket.close
+      if @socket
+        @socket.close 
+        logger.debug "Closed socket #{@socket.inspect}"
       end
       @socket = nil
+    rescue Exception => e
+      puts "Exception in disconnect(): #{e.message}"
+      raise
     end
 
     # Public: Close the context.
     def close
-      if context
-        logger.debug "Closing context #{context.inspect}"
-        context.close
-        context = nil
+      if @context
+        puts "Closing context #{@context.inspect}"
+        @context.close
+        puts "Closed context #{@context.inspect}"
       end
+      @context = nil
+    rescue Exception => e
+      puts "Exception is close(): #{e.message}"
+      raise
+    end
+
+    # Public: shut down the client (disconnect any open sockets
+    # and close the context.
+    def shutdown
+      puts "Disconnecting"
+      disconnect
+      puts "Closing"
+      close
+      puts "Done"
+    rescue Exception => e
+      puts "Exception in shutdown(): #{e.message}"
+      raise
     end
 
     private
@@ -102,6 +115,7 @@ module Zas
         socket
       else
         logger.info "Cannot build a new socket as there is no context"
+        nil
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zas-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: