nats-native 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb5c32131873c0aaa14167195df0ca4907e2b53
-  data.tar.gz: e9aef42d402f201419a0f388dc8761e80266ce94
+  metadata.gz: 59303adca1de3eae3cc6f715fed26fef9d69c15b
+  data.tar.gz: 1c6a2f9fb87c2386935b1d856d299564b6669ef4
 SHA512:
-  metadata.gz: 37b54b49ff9c650799dbcb0a39050cd8846140535b8326e71513682cd9efda1ba37edf5d0e12489211223191680c62d8fe1dbff9542708ac49fb2dfd9a317cce
-  data.tar.gz: 8edfc4e9306562278265093c9c0a439c3e41560be52eee12859508257ca680a22ce2b276730752dd2c9bd5a8a6de0534ca25d7fba4d7c5846bad9f1d9a4aebfd
+  metadata.gz: ba317889fc69b34c99517cc2babb3cb545365c54cff5a9231d86268a08256c2c2758a881ff289fd531a7290e290daf60b761f8fbd214c39fe3a681de2a420c73
+  data.tar.gz: aacf77c70074a08a334f704a6e3d0862283793d31cb290f3314d79721e878f054e24acf88ba96d23c1ecf76949effe9a2a64588030aebb523399904d2333c34d

data/ext/nats/nats.c

@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <nats/nats.h>
 #include <ruby.h>
 
@@ -5,6 +6,18 @@ typedef struct {
     natsConnection *conn;
 } Connection;
 
+static void ruby_nats_raise(natsStatus s) {
+    rb_raise(rb_eException, natsStatus_GetText(s));
+}
+
+static void ruby_nats_on_error(
+        natsConnection *nc,
+        natsSubscription *sub,
+        natsStatus err,
+        void *closure) {
+    ruby_nats_raise(err);
+}
+
 static void ruby_nats_destroy(void *self) {
     ((Connection*) self)->conn = NULL;
     free(self);
@@ -22,13 +35,57 @@ static VALUE ruby_nats_close(VALUE self) {
     return self;
 }
 
-static VALUE ruby_nats_connect(VALUE self, VALUE uri) {
+static VALUE ruby_nats_connect(VALUE self, VALUE params) {
     Connection *conn = NULL;
     Data_Get_Struct(self, Connection, conn);
-    natsStatus s = natsConnection_Connect(&(conn->conn), NULL);
+
+    natsOptions *opts = NULL;
+    natsOptions_Create(&opts);
+    natsOptions_SetErrorHandler(opts, ruby_nats_on_error, NULL);
+
+    if (RTEST(params)) {
+        VALUE val;
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("allow_reconnect")));
+        RTEST(val) && natsOptions_SetAllowReconnect(opts, RTEST(val));
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("dont_randomize_servers")));
+        RTEST(val) && natsOptions_SetNoRandomize(opts, RTEST(val));
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("max_reconnect")));
+        RTEST(val) && natsOptions_SetMaxReconnect(opts, NUM2INT(val));
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("reconnect_time_wait")));
+        RTEST(val) && natsOptions_SetReconnectWait(opts, NUM2INT(val));
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("servers")));
+
+        if (RTEST(val)) {
+            int array_len = RARRAY_LEN(val);
+            VALUE *val_arr = RARRAY_PTR(val);
+            char **servers = malloc(sizeof(char*) * array_len);
+
+            if (servers == NULL) {
+                rb_raise(rb_eException, "Unable to allocate memory for server uri array");
+            }
+
+            for(int i = 0; i < array_len; i++) {
+                char* uri = StringValuePtr(val_arr[i]);
+                servers[i] = uri;
+            }
+            
+            natsOptions_SetServers(opts, servers, array_len);
+        }
+
+
+        val = rb_hash_aref(params, ID2SYM(rb_intern("timeout")));
+        RTEST(val) && natsOptions_SetTimeout(opts, NUM2INT(val));
+    }
+
+    natsStatus s = natsConnection_Connect(&(conn->conn), opts);
 
     if (s != NATS_OK) {
-        rb_raise(rb_eException, natsStatus_GetText(s));
+        ruby_nats_raise(s);
     }
 
     return self;
@@ -42,13 +99,12 @@ static VALUE ruby_nats_publish(VALUE self, VALUE subject, VALUE data) {
         StringValuePtr(subject),
         StringValuePtr(data));
 
-    // if (s == NATS_OK) {
-    //     s = natsConnection_FlushTimeconn(conn->conn, 1000);
-    //     s = natsConnection_Flush(nc);
-    // }
+    if (s == NATS_OK) {
+        s = natsConnection_Flush(conn->conn);
+    }
 
     if (s != NATS_OK) {
-        rb_raise(rb_eException, natsStatus_GetText(s));
+        ruby_nats_raise(s);
     }
 
     return self;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nats-native
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ron Elliott