ffi-hiredis_vip-core 0.1.0.pre4 → 0.1.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663a312faeb9876f597a3d3ec243a78a6f8a1a1a
-  data.tar.gz: 03c4726d35b3a48335f2f52c7da6e5da5de43c00
+  metadata.gz: 9c17d4474aa30be236e4162762f77dfa70ec2705
+  data.tar.gz: f0e287223d98ecb2094c48a8dcca9f030834615a
 SHA512:
-  metadata.gz: 29af71e9d5f9fee7fd73f7df585d17df858390b126eca07b923b76f6e96c89f2e93427c20da8268c6eaa4b973efb6bde5caea4941daa10994089b60d85efee34
-  data.tar.gz: 19adb10cc75ecee01a98df7d5b1874bb47d29a64e15931dc2f9bcc56cc8cad4784d319261c293093d71ef6e2c07925fa6e08240452e2756aada88c62eca02441
+  metadata.gz: 9e1c4480814a6faca36e99bf9caca3ca2a31682d722fc9bfb80bf22bea422c0246810f8f21addfd4f3c18c518b3781355f23f05f94dae83c6eed684f200d7d71
+  data.tar.gz: e3e356414bc3f70ea7fe22a003b8e2d18c7f935348921543689dc80a617c02125692103cf92e2e2f494cff3699c2c590a7bf08f15134a90c77110f5c61d64765

data/lib/ffi/hiredis_vip/core.rb

@@ -9,6 +9,8 @@ module FFI
       extend ::FFI::Library
       ffi_lib_flags :now, :global
 
+      class ConnectionError < RuntimeError; end
+
       ##
       # ffi-rzmq-core for reference
       #
@@ -50,11 +52,13 @@ module FFI
         if HIREDIS_VIP_LIB_PATHS.any? {|path|
           File.file? File.join(path, "libhiredis_vip.#{FFI::Platform::LIBSUFFIX}")}
           warn "Unable to load this gem. The libhiredis_vip library exists, but cannot be loaded."
+          warn "Set HIREDIS_VIP_LIB_PATH if custom load path is desired"
           warn "If this is Windows:"
           warn "-  Check that you have MSVC runtime installed or statically linked"
           warn "-  Check that your DLL is compiled for #{FFI::Platform::ADDRESS_SIZE} bit"
         else
           warn "Unable to load this gem. The libhiredis_vip library (or DLL) could not be found."
+          warn "Set HIREDIS_VIP_LIB_PATH if custom load path is desired"
           warn "If this is a Windows platform, make sure libhiredis_vip.dll is on the PATH."
           warn "If the DLL was built with mingw, make sure the other two dependent DLLs,"
           warn "libgcc_s_sjlj-1.dll and libstdc++6.dll, are also on the PATH."
@@ -70,6 +74,9 @@ module FFI
         :HIRCLUSTER_FLAG_ADD_OPENSLOT, 0x2000, #/* The flag to decide whether add open slot for master node. (10000000000000) */
         :HIRCLUSTER_FLAG_ROUTE_USE_SLOTS, 0x4000 # /* The flag to decide whether add open slot for master node. (100000000000000) */
 
+      RedisConnectionType = enum :REDIS_CONN_TCP, 0,
+                                 :REDIS_CONN_UNIX, 1
+
       RedisReplyType = enum :REDIS_REPLY_STRING, 1,
         :REDIS_REPLY_ARRAY, 2,
         :REDIS_REPLY_INTEGER, 3,
@@ -91,6 +98,28 @@ module FFI
           :tv_usec, :long
       end
 
+      class RedisTcpStruct < ::FFI::Struct
+        layout :host, :string,
+               :source_addr, :string,
+               :port, :int
+      end
+
+      class RedisUnixStruct < ::FFI::Struct
+        layout :path, :string
+      end
+
+      class RedisContext < ::FFI::Struct
+        layout :err, :int,
+               :errstr, [:char, 128],
+               :fd, :int,
+               :flags, :int,
+               :obuf, :string,
+               :connection_type, RedisConnectionType,
+               :timeval, :pointer,
+               :tcp, RedisTcpStruct,
+               :unix_sock, RedisUnixStruct
+      end
+
       class RedisReply < ::FFI::Struct
         layout :type, ::FFI::HiredisVip::Core::RedisReplyType,
           :integer, :long_long,
@@ -121,7 +150,12 @@ module FFI
       end
 
       def self.connect(host, port)
-        ::FFI::AutoPointer.new(::FFI::HiredisVip::Core.redisConnect(host, port), ::FFI::HiredisVip::Core.method(:redisFree))
+        redis_context = ::FFI::HiredisVip::Core.redisConnect(host, port)
+        redis_context_reply = ::FFI::HiredisVip::Core::RedisContext.new(redis_context)
+
+        raise ::FFI::HiredisVip::Core::ConnectionError, redis_context_reply[:errstr] unless redis_context_reply[:err] == 0
+
+        ::FFI::AutoPointer.new(redis_context, ::FFI::HiredisVip::Core.method(:redisFree))
       end
 
       def self.cluster_command(cluster_context, command, *args)

data/lib/ffi/hiredis_vip/core/version.rb

@@ -1,7 +1,7 @@
 module FFI
   module HiredisVip
     module Core
-      VERSION = "0.1.0.pre4"
+      VERSION = "0.1.0.pre5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-hiredis_vip-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre4
+  version: 0.1.0.pre5
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi