agoo 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875dd13c45030ea940c3afe58571a260f6220ff8f09ed3fd1084957e0efa3586
-  data.tar.gz: d8efe96974e9299d1627373cc31be42f93b7bed3eb00c7593c32b8aa9fe954cb
+  metadata.gz: 4972cbbcab2bb5e6efd12fdbe709e6e3b5e3c21edba29bd9abf66e6aecb5dcf5
+  data.tar.gz: 6a5d2c4c783a19c4452ea65b5509a8c9acce86bb15dcdacef805615084c07c6a
 SHA512:
-  metadata.gz: b66d7a3f8265fab7f84c9a78894401950adcbd7a55df412ab7ff92bc497ff825777498cf58ff1a0e3ba0b168aecec597da823ac61455f57b4f9d26ef32e1264b
-  data.tar.gz: d82ea3f18c07459186e64a8db4fda82e07bdb55e7506a031eebeb628c05e458eb4507fb531144fd1559f39c5543d0569a9fdc9738df47110ed4edf68045c1c83
+  metadata.gz: dded79dd9e1850504e766708f3c646ecc2930991a5cfbf3c470533a1881e606404aaf75abf0ae1f81ec161d4caac3b85268f0504c11b748bb024b57194034b67
+  data.tar.gz: ec6ec4aa3199cfb1aedea0203f2ec33602884c134b7144f2febcf2b7009cd069c54439b9ae90485a68e12ec3f18fcf37d36b2e96928744aa6937fe8e28e0f61a

data/ext/agoo/con.c

@@ -52,7 +52,7 @@ con_header_value(const char *header, int hlen, const char *key, int *vlen) {
     const char	*h = header;
     const char	*hend = header + hlen;
     const char	*value;
-    int		klen = strlen(key);
+    int		klen = (int)strlen(key);
     
     while (h < hend) {
 	if (0 == strncmp(key, h, klen) && ':' == h[klen]) {
@@ -62,7 +62,7 @@ con_header_value(const char *header, int hlen, const char *key, int *vlen) {
 	    value = h;
 	    for (; '\r' != *h && '\0' != *h; h++) {
 	    }
-	    *vlen = h - value;
+	    *vlen = (int)(h - value);
 
 	    return value;
 	}
@@ -161,7 +161,7 @@ con_header_read(Con c) {
 	} else {
 	    return bad_request(c, 400, __LINE__);
 	}
-	if (NULL == (v = con_header_value(c->buf, hend - c->buf, "Content-Length", &vlen))) {
+	if (NULL == (v = con_header_value(c->buf, (int)(hend - c->buf), "Content-Length", &vlen))) {
 	    return bad_request(c, 411, __LINE__);
 	}
 	clen = (size_t)strtoul(v, &vend, 10);
@@ -225,7 +225,7 @@ con_header_read(Con c) {
     if (NULL == (hook = hook_find(server->hooks, method, path, pend))) {
 	if (GET == method) {
 	    struct _Err	err = ERR_INIT;
-	    Page	p = page_get(&err, &server->pages, server->root, path, pend - path);
+	    Page	p = page_get(&err, &server->pages, server->root, path, (int)(pend - path));
 	    Res		res;
 
 	    if (NULL == p) {
@@ -242,7 +242,7 @@ con_header_read(Con c) {
 	    c->res_tail = res;
 
 	    b = strstr(c->buf, "\r\n");
-	    res->close = should_close(b, hend - b);
+	    res->close = should_close(b, (int)(hend - b));
 
 	    text_ref(p->resp);
 	    res_set_message(res, p->resp);
@@ -262,15 +262,15 @@ con_header_read(Con c) {
     c->req->server = server;
     c->req->method = method;
     c->req->path.start = c->req->msg + (path - c->buf);
-    c->req->path.len = pend - path;
+    c->req->path.len = (int)(pend - path);
     c->req->query.start = c->req->msg + (query - c->buf);
-    c->req->query.len = qend - query;
+    c->req->query.len = (int)(qend - query);
     c->req->mlen = mlen;
     c->req->body.start = c->req->msg + (hend - c->buf + 4);
-    c->req->body.len = clen;
+    c->req->body.len = (unsigned int)clen;
     b = strstr(b, "\r\n");
     c->req->header.start = c->req->msg + (b + 2 - c->buf);
-    c->req->header.len = hend - b - 2;
+    c->req->header.len = (unsigned int)(hend - b - 2);
     c->req->res = NULL;
     if (NULL != hook) {
 	c->req->handler = hook->handler;
@@ -441,7 +441,7 @@ con_loop(void *x) {
 	    i--;
 	    pp++;
 	}
-	if (0 > (i = poll(pa, pp - pa, 100))) {
+	if (0 > (i = poll(pa, (nfds_t)(pp - pa), 100))) {
 	    if (EAGAIN == errno) {
 		continue;
 	    }

data/ext/agoo/error_stream.c

@@ -39,7 +39,7 @@ static VALUE
 es_puts(VALUE self, VALUE str) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
 
-    es->text = text_append(es->text, StringValuePtr(str), RSTRING_LEN(str));
+    es->text = text_append(es->text, StringValuePtr(str), (int)RSTRING_LEN(str));
     es->text = text_append(es->text, "\n", 1);
 
     return Qnil;
@@ -54,7 +54,7 @@ es_puts(VALUE self, VALUE str) {
 static VALUE
 es_write(VALUE self, VALUE str) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
-    int		cnt = RSTRING_LEN(str);
+    int		cnt = (int)RSTRING_LEN(str);
     
     es->text = text_append(es->text, StringValuePtr(str), cnt);
 

data/ext/agoo/extconf.rb

@@ -5,6 +5,7 @@ extension_name = 'agoo'
 dir_config(extension_name)
 
 $CPPFLAGS += " -DPLATFORM_LINUX" if 'x86_64-linux' == RUBY_PLATFORM
+RbConfig::MAKEFILE_CONFIG['CC'] = "gcc-6" if 'x86_64-linux' == RUBY_PLATFORM
 
 create_makefile(File.join(extension_name, extension_name))
 

data/ext/agoo/http.c

@@ -464,7 +464,7 @@ get_bucketp(uint64_t h) {
 
 static void
 key_set(const char *key) {
-    int		len = strlen(key);
+    int		len = (int)strlen(key);
     int64_t	h = calc_hash(key, &len);
     Slot	*bucket = get_bucketp(h);
     Slot	s;

data/ext/agoo/log.c

@@ -121,7 +121,7 @@ classic_write(Log log, LogEntry e, FILE *file) {
     t += log->zone;
     if (log->day_start <= t && t < log->day_end) {
 	t -= log->day_start;
-	hour = t / 3600;
+	hour = (int)(t / 3600);
 	min = t % 3600 / 60;
 	sec = t % 60;
     } else {
@@ -346,7 +346,7 @@ log_init(Err err, Log log, VALUE cfg) {
     log->console = true;
     log->classic = true;
     log->colorize = true;
-    log->zone = (int64_t)(timegm(tm) - t);
+    log->zone = (int)(timegm(tm) - t);
     log->day_start = 0;
     log->day_end = 0;
     *log->day_buf = '\0';

data/ext/agoo/page.c

@@ -184,7 +184,7 @@ page_destroy(Page p) {
 static bool
 update_contents(Page p) {
     const char	*mime = NULL;
-    int		plen = strlen(p->path);
+    int		plen = (int)strlen(p->path);
     const char	*suffix = p->path + plen - 1;
     FILE	*f;
     long	size;
@@ -284,7 +284,7 @@ update_contents(Page p) {
 	text_release(p->resp);
 	p->resp = NULL;
     }
-    p->resp = text_create(msg, msize);
+    p->resp = text_create(msg, (int)msize);
     text_ref(p->resp);
     p->last_check = dtime();
 

data/ext/agoo/queue.c

@@ -184,7 +184,7 @@ queue_release(Queue q) {
 
 int
 queue_count(Queue q) {
-    int	size = q->end - q->q;
+    int	size = (int)(q->end - q->q);
     
     return (q->tail - q->head + size) % size;
 }

data/ext/agoo/request.c

@@ -354,7 +354,7 @@ fill_headers(Req r, VALUE hash) {
     char		*h = r->header.start;
     char		*end = h + r->header.len;
     char		*key = h;
-    char		*kend;
+    char		*kend = key;
     char		*val = NULL;
     char		*vend;
     
@@ -382,7 +382,7 @@ fill_headers(Req r, VALUE hash) {
 	    if ('\n' == *(h + 1)) {
 		h++;
 	    }
-	    add_header_value(hash, key, kend - key, val, vend - val);
+	    add_header_value(hash, key, (int)(kend - key), val, (int)(vend - val));
 	    key = h + 1;
 	    kend = NULL;
 	    val = NULL;

data/ext/agoo/response.c

@@ -125,7 +125,7 @@ body_set(VALUE self, VALUE val) {
 
     if (T_STRING == rb_type(val)) {
 	res->body = strdup(StringValuePtr(val));
-	res->blen = RSTRING_LEN(val);
+	res->blen = (int)RSTRING_LEN(val);
     } else {
 	// TBD use Oj
     }
@@ -172,7 +172,7 @@ head_get(VALUE self, VALUE key) {
     Response	res = (Response)DATA_PTR(self);
     Header	h;
     const char	*ks = StringValuePtr(key);
-    int		klen = RSTRING_LEN(key);
+    int		klen = (int)RSTRING_LEN(key);
     
     for (h = res->headers; NULL != h; h = h->next) {
 	if (0 == strncasecmp(h->text, ks, klen) && klen + 1 < h->len && ':' == h->text[klen]) {
@@ -195,7 +195,7 @@ head_set(VALUE self, VALUE key, VALUE val) {
     Header	prev = NULL;
     const char	*ks = StringValuePtr(key);
     const char	*vs;
-    int		klen = RSTRING_LEN(key);
+    int		klen = (int)RSTRING_LEN(key);
     int		vlen;
     int		hlen;
 
@@ -215,7 +215,7 @@ head_set(VALUE self, VALUE key, VALUE val) {
 	val = rb_funcall(val, rb_intern("to_s"), 0);
     }
     vs = StringValuePtr(val);
-    vlen = RSTRING_LEN(val);
+    vlen = (int)RSTRING_LEN(val);
 
     if (res->server->pedantic) {
 	http_header_ok(ks, klen, vs, vlen);

data/ext/agoo/server.c

@@ -249,6 +249,7 @@ listen_loop(void *x) {
 	return NULL;
     }
     listen(pa->fd, 1000);
+    server->ready = true;
     pa->events = POLLIN;
     pa->revents = 0;
 
@@ -317,7 +318,7 @@ rescue_error(VALUE x) {
     if ((int)(sizeof(buf) - sizeof(bad500) + 7) <= len) {
 	len = sizeof(buf) - sizeof(bad500) + 7;
     }
-    cnt = snprintf(buf, sizeof(buf), "HTTP/1.1 500 Internal Error\r\nConnection: Close\r\nContent-Length: %d\r\n\r\n%s: %s", len, classname, ms);
+    cnt = snprintf(buf, sizeof(buf), "%s%d\r\n\r\n%s: %s", bad500, len, classname, ms);
     message = text_create(buf, cnt);
 
     req->res->close = true;
@@ -421,7 +422,7 @@ handle_rack_inner(void *x) {
     }
     if (T_ARRAY != rb_type(bv)) {
 	int	i;
-	int	bcnt = RARRAY_LEN(bv);
+	int	bcnt = (int)RARRAY_LEN(bv);
 	
 	for (i = 0; i < bcnt; i++) {
 	    bsize += (int)RSTRING_LEN(rb_ary_entry(bv, i));
@@ -437,10 +438,11 @@ handle_rack_inner(void *x) {
     case 205:
     case 304:
 	// TBD Content-Type and Content-Length can not be present
-	t->len = sprintf(t->text, "HTTP/1.1 %d %s\r\n", code, status_msg);
+	t->len = snprintf(t->text, 1024, "HTTP/1.1 %d %s\r\n", code, status_msg);
 	break;
     default:
-	t->len = sprintf(t->text, "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", code, status_msg, bsize);
+	// Note that using simply sprintf causes an abort with travis OSX tests.
+	t->len = snprintf(t->text, 1024, "HTTP/1.1 %d %s\r\nContent-Length: %d\r\n", code, status_msg, bsize);
 	break;
     }
     if (T_HASH == rb_type(hv)) {
@@ -453,7 +455,7 @@ handle_rack_inner(void *x) {
 	if (T_ARRAY == rb_type(bv)) {
 	    VALUE	v;
 	    int		i;
-	    int		bcnt = RARRAY_LEN(bv);
+	    int		bcnt = (int)RARRAY_LEN(bv);
 
 	    for (i = 0; i < bcnt; i++) {
 		v = rb_ary_entry(bv, i);
@@ -561,11 +563,24 @@ start(VALUE self) {
     Server	server = (Server)DATA_PTR(self);
     VALUE	*vp;
     int		i;
+    double	giveup;
     
     server->active = true;
+    server->ready = false;
 
     pthread_create(&server->listen_thread, NULL, listen_loop, server);
     pthread_create(&server->con_thread, NULL, con_loop, server);
+    
+    giveup = dtime() + 1.0;
+    while (dtime() < giveup) {
+	if (server->ready) {
+	    break;
+	}
+	dsleep(0.001);
+    }
+    signal(SIGINT, sig_handler);
+    signal(SIGTERM, sig_handler);
+    signal(SIGPIPE, SIG_IGN);
 
     if (0 >= server->thread_cnt) {
 	Req		req;
@@ -884,8 +899,4 @@ server_init(VALUE mod) {
     put_sym = ID2SYM(rb_intern("PUT"));		rb_gc_register_address(&put_sym);
 
     http_init();
-
-    signal(SIGINT, sig_handler);
-    signal(SIGTERM, sig_handler);
-    signal(SIGPIPE, SIG_IGN);
 }

data/ext/agoo/server.h

@@ -16,6 +16,7 @@
 
 typedef struct _Server {
     volatile bool	active;
+    volatile bool	ready;
     int			thread_cnt;
     int			port;
     bool		pedantic;

data/ext/agoo/text.c

@@ -47,7 +47,7 @@ text_release(Text t) {
 Text
 text_append(Text t, const char *s, int len) {
     if (0 >= len) {
-	len = strlen(s);
+	len = (int)strlen(s);
     }
     if (t->alen <= t->len + len) {
 	long	new_len = t->alen + t->alen / 2;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/test/log_test.rb

@@ -116,6 +116,7 @@ class LogClassicTest < Minitest::Test
   def error_test(server)
     server.error('my message')
     server.log_flush(1.0)
+    sleep(0.01) # seems to be needed to assure writes actually happened even though flush was called.
     content = IO.read('log/agoo.log')
     assert_match(/ERROR: my message/, content)
   end
@@ -123,6 +124,7 @@ class LogClassicTest < Minitest::Test
   def warn_test(server)
     server.warn('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log')
     assert_match(/WARN: my message/, content)
   end
@@ -130,6 +132,7 @@ class LogClassicTest < Minitest::Test
   def info_test(server)
     server.info('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log')
     assert_match(/INFO: my message/, content)
   end
@@ -137,6 +140,7 @@ class LogClassicTest < Minitest::Test
   def debug_test(server)
     server.debug('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log')
     assert_match(/DEBUG: my message/, content)
   end
@@ -144,6 +148,7 @@ class LogClassicTest < Minitest::Test
   def log_eval_test(server)
     server.log_eval('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log')
     assert_match(/eval: my message/, content)
   end
@@ -180,6 +185,7 @@ class LogJsonTest < Minitest::Test
   def error_test(server)
     server.error('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log.1')
     assert_match(/"where":"ERROR"/, content)
     assert_match(/"level":1/, content)
@@ -189,6 +195,7 @@ class LogJsonTest < Minitest::Test
   def warn_test(server)
     server.warn('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log.1')
     assert_match(/"where":"WARN"/, content)
     assert_match(/"level":2/, content)
@@ -198,6 +205,7 @@ class LogJsonTest < Minitest::Test
   def info_test(server)
     server.info('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log.1')
     assert_match(/"where":"INFO"/, content)
     assert_match(/"level":3/, content)
@@ -207,6 +215,7 @@ class LogJsonTest < Minitest::Test
   def debug_test(server)
     server.debug('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log.1')
     assert_match(/"where":"DEBUG"/, content)
     assert_match(/"level":4/, content)
@@ -216,6 +225,7 @@ class LogJsonTest < Minitest::Test
   def eval_test(server)
     server.log_eval('my message')
     server.log_flush(1.0)
+    sleep(0.01)
     content = IO.read('log/agoo.log.1')
     assert_match(/"where":"eval"/, content)
     assert_match(/"level":3/, content)
@@ -245,6 +255,7 @@ class LogRollTest < Minitest::Test
 	@server.info("my #{i} message")
       }
       @server.log_flush(1.0)
+      sleep(0.01)
       content = IO.read('log/agoo.log')
       assert_match(/INFO: my 9 message/, content)
 

data/test/rack_handler_test.rb

@@ -42,7 +42,7 @@ class RackHandlerTest < Minitest::Test
 
   def test_rack
     begin
-      server = Agoo::Server.new(6465, 'root',
+      server = Agoo::Server.new(6467, 'root',
 				pedantic: false,
 				log_dir: '',
 				thread_count: 1,
@@ -63,6 +63,7 @@ class RackHandlerTest < Minitest::Test
       server.handle(:GET, "/tellme", handler)
       server.handle(:POST, "/makeme", handler)
       server.handle(:PUT, "/makeme", handler)
+
       server.start()
 
       eval_test
@@ -74,7 +75,7 @@ class RackHandlerTest < Minitest::Test
   end
   
   def eval_test
-    uri = URI('http://localhost:6465/tellme?a=1')
+    uri = URI('http://localhost:6467/tellme?a=1')
     req = Net::HTTP::Get.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'
@@ -96,7 +97,7 @@ class RackHandlerTest < Minitest::Test
       "REQUEST_METHOD" => "GET",
       "SCRIPT_NAME" => "/tellme",
       "SERVER_NAME" => "localhost",
-      "SERVER_PORT" => "6465",
+      "SERVER_PORT" => "6467",
       "rack.errors" => nil,
       "rack.input" => nil,
       "rack.multiprocess" => false,
@@ -115,7 +116,7 @@ class RackHandlerTest < Minitest::Test
   end
 
   def post_test
-    uri = URI('http://localhost:6465/makeme')
+    uri = URI('http://localhost:6467/makeme')
     req = Net::HTTP::Post.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'
@@ -129,7 +130,7 @@ class RackHandlerTest < Minitest::Test
   end
   
   def put_test
-    uri = URI('http://localhost:6465/makeme')
+    uri = URI('http://localhost:6467/makeme')
     req = Net::HTTP::Put.new(uri)
     # Set the headers the way we want them.
     req['Accept-Encoding'] = '*'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Peter Ohler