From 5de83201ea26dbd0af38ee10ecff98c99df2b6b5 Mon Sep 17 00:00:00 2001
From: Unbit <info@unbit.it>
Date: Thu, 26 Dec 2013 17:06:36 +0100
Subject: [PATCH] getting rid of dynami options (step 3)

---
 plugins/coroae/coroae.c      | 10 +++++-----
 plugins/gccgo/gccgo_plugin.c |  6 +++---
 plugins/rados/rados.c        |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/coroae/coroae.c b/plugins/coroae/coroae.c
index a76a1382..766c2813 100644
--- a/plugins/coroae/coroae.c
+++ b/plugins/coroae/coroae.c
@@ -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);
         }
 
 
diff --git a/plugins/gccgo/gccgo_plugin.c b/plugins/gccgo/gccgo_plugin.c
index 482a8f28..d2aa4eeb 100644
--- a/plugins/gccgo/gccgo_plugin.c
+++ b/plugins/gccgo/gccgo_plugin.c
@@ -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
diff --git a/plugins/rados/rados.c b/plugins/rados/rados.c
index 44bb9b96..21542c43 100644
--- a/plugins/rados/rados.c
+++ b/plugins/rados/rados.c
@@ -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;