clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-08-22 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

getting rid of dynami options (step 3)

Browse Source
This commit is contained in:
Unbit
2013-12-26 17:06:36 +01:00
parent 6d69c01651
commit 5de83201ea
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/coroae/coroae.c
+5 -5
View File
@@ -12,8 +12,8 @@ static void uwsgi_opt_setup_coroae(char *opt, char *value, void *null) {
// set async mode
uwsgi_opt_set_int(opt, value, &uwsgi.async);
if (uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] < 30) {
uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT] = 30;
if (uwsgi.socket_timeout < 30) {
uwsgi.socket_timeout = 30;
}
// set loop engine
uwsgi.loop = "coroae";
@@ -164,7 +164,7 @@ XS(XS_coroae_accept_request) {
}
for(;;) {
int ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
int ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.socket_timeout);
wsgi_req->switches++;
if (ret <= 0) {
@@ -244,8 +244,8 @@ edge:
wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
// enter harakiri mode
if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
if (uwsgi.harakiri_options.workers > 0) {
set_harakiri(uwsgi.harakiri_options.workers);
}
plugins/gccgo/gccgo_plugin.c
+3 -3
View File
@@ -264,7 +264,7 @@ static void uwsgi_gccgo_request_goroutine(void *arg) {
int ret,status;
for(;;) {
ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT]);
ret = uwsgi.wait_read_hook(wsgi_req->fd, uwsgi.socket_timeout);
wsgi_req->switches++;
if (ret <= 0) {
@@ -388,8 +388,8 @@ retry:
wsgi_req->start_of_request_in_sec = wsgi_req->start_of_request/1000000;
// enter harakiri mode
if (uwsgi.shared->options[UWSGI_OPTION_HARAKIRI] > 0) {
set_harakiri(uwsgi.shared->options[UWSGI_OPTION_HARAKIRI]);
if (uwsgi.harakiri_options.workers > 0) {
set_harakiri(uwsgi.harakiri_options.workers);
}
// spawn the new goroutine
plugins/rados/rados.c
+1 -1
View File
@@ -158,7 +158,7 @@ static void uwsgi_rados_add_mountpoint(char *arg, size_t arg_len) {
// this happens before fork() if not in lazy/lazy-apps mode
static void uwsgi_rados_setup() {
if (!urados.timeout) {
urados.timeout = uwsgi.shared->options[UWSGI_OPTION_SOCKET_TIMEOUT];
urados.timeout = uwsgi.socket_timeout;
}
struct uwsgi_string_list *usl = urados.mountpoints;