@@ -133,6 +133,7 @@ VALUE backend_close(VALUE self) if (backend->open) { backend->open = 0; ev_io_stop(backend->loop, &backend->accept_watcher); + shutdown(backend->fd, SHUT_RDWR); close(backend->fd); } ext/thin_backend/backend.c @@ -155,8 +155,10 @@ void connection_close(connection_t *c) rb_gc_unregister_address(&c->input); /* kill the thread if still running */ - if (c->thread.active) + if (c->thread.active) { + c->backend->thread_count--; rb_thread_kill(c->thread.obj); + } /* put back in the queue of unused connections */ queue_push(&c->backend->connections, c); ext/thin_backend/connection.c @@ -124,11 +124,12 @@ static VALUE response_run(connection_t *c) { /* Call the app to process the request */ VALUE response = rb_funcall_rescue(c->backend->app, sInternedCall, 1, c->env); + unsigned sent = 0; if (response == Qundef) { /* log any error */ rb_funcall(c->backend->obj, rb_intern("log_last_exception"), 0); - connection_close(c); + sent = 1; } else { /* store response info and prepare for writing */ @@ -149,12 +150,15 @@ static VALUE response_run(connection_t *c) c->finished = 1; if (buffer_eof(&c->write_buffer)) - connection_close(c); + sent = 1; } - c->thread.active = 0; c->backend->thread_count--; + c->thread.active = 0; + + if (sent) + connection_close(c); return Qnil; } ext/thin_backend/response.c b708830bd819c5b733441b45a4ecb626a9da0d74 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/a9f3f2909d6e6aea96c11a3f102f5490ea34c7f8 a9f3f2909d6e6aea96c11a3f102f5490ea34c7f8 2008-06-11T20:14:34-07:00 2008-06-11T20:14:34-07:00 Decrement thread_count equally on succressfull and failed request. b96c469bf19c53e4b98263646dbc9eba812542f5 macournoyer macournoyer@gmail.com