agoo 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af291829d85f65bcbc9f124b1f63e470f78d2650c84bc78cba437b46cd994eac
-  data.tar.gz: 9b894a8bc473f26667617da0c47704a853afb97b6a04c3e5f4dd4c427879fbc2
+  metadata.gz: 47c645a0bab39e564510cdf0971a61f2ea710f3d4015eed73b18e32f464b9ee9
+  data.tar.gz: 5bc646705ef75cf6a1eb2105a1c59cd8bf81dc5940c4ef358542e989caa13fb4
 SHA512:
-  metadata.gz: e4eae332a464287827a3c4fd8a6f833cbf2a451e24df78c7f8e7424f428abcc8cce6983bb08e7ec73c1dcb6a1b4193213297ea163c2d769e65223043b1da31ba
-  data.tar.gz: cc930402da457aeecc9c6279278ea8ac89fd607d6b11add8512dec5c293d8738041d27f2f1c30ce1a98e2544bd6017c20f64b615c1f93f2b26e5fe7cf5a195bc
+  metadata.gz: 75a2d84ce4ec662f7abcaa8875b3f35d94969114e6a9a6b14cc3dc60d4e751889bbb2d8abbd89493d148a5f8786917122d53b7301b7b58d89f16110f77abfcbb
+  data.tar.gz: 6eb587543a0b4ffed788c2d43e72fa26302d5844a4cb4b5a2444d982144e8da63239e815ae5f75d2fed5786f3f00b3bf416a1638ad5ef78054eb468059645053

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+### 2.8.2 - 2019-03-08
+
+Rack compatibility improvement.
+
+- Add miss `close` method to `Agoo::ErrorStream`.
+
+- Rack builder wrapper added.
+
 ### 2.8.1 - 2019-03-01
 
 Add missing options.

data/bin/agoo

@@ -190,6 +190,22 @@ else
     end
     ::Rack::Handler::Agoo.run(handler, options)
   end
-  puts "  Running #{@run_file}" if 1 <= @verbose
-  load(@run_file)
+
+  path = File.expand_path(@run_file)
+  if @run_file.end_with?('.ru')
+    begin
+      require 'rack'
+      puts "  Racking #{@run_file}" if 1 <= @verbose
+      app = Rack::Builder.new {
+	eval(File.open(path).read)
+      }
+      run app
+    rescue LoadError
+      puts "  Running #{path}" if 1 <= @verbose
+      load(path)
+    end
+  else
+    puts "  Running #{path}" if 1 <= @verbose
+    load(path)
+  end
 end

data/ext/agoo/error_stream.c

@@ -14,10 +14,12 @@ typedef struct _errorStream {
 
 static void
 es_free(void *ptr) {
-    ErrorStream	es = (ErrorStream)ptr;
+    if (NULL != ptr) {
+	ErrorStream	es = (ErrorStream)ptr;
 
-    AGOO_FREE(es->text); // allocated with malloc
-    AGOO_FREE(ptr);
+	AGOO_FREE(es->text); // allocated with malloc
+	AGOO_FREE(ptr);
+    }
 }
 
 VALUE
@@ -45,6 +47,9 @@ static VALUE
 es_puts(VALUE self, VALUE str) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
 
+    if (NULL == es) {
+	rb_raise(rb_eIOError, "error stream has been closed.");
+    }
     es->text = agoo_text_append(es->text, StringValuePtr(str), (int)RSTRING_LEN(str));
     es->text = agoo_text_append(es->text, "\n", 1);
     if (NULL == es->text) {
@@ -64,6 +69,9 @@ es_write(VALUE self, VALUE str) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
     int		cnt = (int)RSTRING_LEN(str);
 
+    if (NULL == es) {
+	rb_raise(rb_eIOError, "error stream has been closed.");
+    }
     if (NULL == (es->text = agoo_text_append(es->text, StringValuePtr(str), cnt))) {
 	rb_raise(rb_eNoMemError, "Failed to allocate memory for the error stream puts.");
     }
@@ -80,12 +88,32 @@ static VALUE
 es_flush(VALUE self) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
 
+    if (NULL == es) {
+	rb_raise(rb_eIOError, "error stream has been closed.");
+    }
     agoo_log_cat(&agoo_error_cat, "%s", es->text->text);
     es->text->len = 0;
 
     return self;
 }
 
+/* Document-method: close
+
+ * call-seq: close()
+ *
+ * Closes the stream.
+ */
+static VALUE
+es_close(VALUE self) {
+    ErrorStream	es = (ErrorStream)DATA_PTR(self);
+
+    es_flush(self);
+    DATA_PTR(self) = NULL;
+    es_free(es);
+
+    return self;
+}
+
 /* Document-class: Agoo::ErrorStream
  *
  * Used in a reqquest as the _rack.errors_ attribute. Writing to the stream
@@ -98,4 +126,5 @@ error_stream_init(VALUE mod) {
     rb_define_method(es_class, "puts", es_puts, 1);
     rb_define_method(es_class, "write", es_write, 1);
     rb_define_method(es_class, "flush", es_flush, 0);
+    rb_define_method(es_class, "close", es_close, 0);
 }

data/ext/agoo/queue.c

@@ -108,6 +108,7 @@ agooQItem
 agoo_queue_pop(agooQueue q, double timeout) {
     agooQItem	item;
     agooQItem	*next;
+    int cnt;
     
     if (q->multi_pop) {
 	while (atomic_flag_test_and_set(&q->pop_lock)) {
@@ -129,7 +130,7 @@ agoo_queue_pop(agooQueue q, double timeout) {
 	next = q->q;
     }
     // If the next is the tail then wait for something to be appended.
-    for (int cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&q->tail) == next; cnt--) {
+    for (cnt = (int)(timeout / (double)WAIT_MSECS * 1000.0); atomic_load(&q->tail) == next; cnt--) {
 	struct pollfd	pa;
 
 	if (cnt <= 0) {

data/ext/agoo/rserver.c

@@ -919,7 +919,7 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
 	handler = resolve_classpath(StringValuePtr(handler), RSTRING_LEN(handler));
     }
     if (rb_respond_to(handler, static_id)) {
-	if (Qtrue == rb_funcall(handler, static_id, 0, Qnil)) {
+	if (Qtrue == rb_funcall(handler, static_id, 0)) {
 	    VALUE	res = rb_funcall(handler, call_id, 1, Qnil);
 	    VALUE	bv;
 

data/ext/agoo/server.c

@@ -24,6 +24,8 @@
 
 struct _agooServer	agoo_server = {false};
 
+double	agoo_io_loop_ratio = 0.5;
+
 int
 agoo_server_setup(agooErr err) {
     long	i;
@@ -40,7 +42,7 @@ agoo_server_setup(agooErr err) {
     }
     agoo_server.loop_max = 4;
     if (0 < (i = sysconf(_SC_NPROCESSORS_ONLN))) {
-	i /= 2;
+	i = (int)(i * agoo_io_loop_ratio);
 	if (1 >= i) {
 	    i = 1;
 	}
@@ -252,6 +254,7 @@ void
 agoo_server_bind(agooBind b) {
     // If a bind with the same port already exists, replace it.
     agooBind	prev = NULL;
+    agooBind    bx   = NULL;
 
     if (NULL == b->read) {
 	b->read = agoo_con_http_read;
@@ -262,7 +265,7 @@ agoo_server_bind(agooBind b) {
     if (NULL == b->events) {
 	b->events = agoo_con_http_events;
     }
-    for (agooBind bx = agoo_server.binds; NULL != bx; bx = bx->next) {
+    for (bx = agoo_server.binds; NULL != bx; bx = bx->next) {
 	if (bx->port == b->port) {
 	    b->next = bx->next;
 	    if (NULL == prev) {

data/ext/agoo/server.h

@@ -36,20 +36,18 @@ typedef struct _agooServer {
     int				loop_max;
     int				loop_cnt;
     atomic_int			con_cnt;
-    
+
     struct _agooUpgraded	*up_list;
     pthread_mutex_t		up_lock;
     int				max_push_pending;
     void			*env_nil_value;
     void			*ctx_nil_value;
-    
+
     // A count of the running threads from the wrapper or the server managed
     // threads.
     atomic_int			running;
 } *agooServer;
 
-extern struct _agooServer	agoo_server;
-
 extern int	agoo_server_setup(agooErr err);
 extern void	agoo_server_shutdown(const char *app_name, void (*stop)());
 extern void	agoo_server_bind(agooBind b);
@@ -67,4 +65,8 @@ extern int	agoo_server_add_func_hook(agooErr	err,
 
 extern void	agoo_server_publish(struct _agooPub *pub);
 
+extern struct _agooServer	agoo_server;
+
+extern double	agoo_io_loop_ratio;
+
 #endif // AGOO_SERVER_H

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.8.1'
+  VERSION = '2.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj