Changeset 239:d6735a53d498 for uwsgi.c

Timestamp:

02/15/10 14:55:20 (6 months ago)

Author:

roberto@…

Branch:

default

Message:

stronger reload recognition

Files:

• uwsgi.c (modified) (4 diffs)

uwsgi.c

@@ -55 +55 @@
 static const char *app_slash = "/";
 #endif
+
+extern char **environ;
 
 int find_worker_id (pid_t pid) {
@@ -532 +534 @@
         int ready_to_die = 0;
 
+        char *env_reloads ;
+        unsigned int reloads = 0;
         int is_a_reload = 0;
+        char env_reload_buf[11];
 
         char *buffer;
@@ -668 +673 @@
         strcpy (binary_path, argv[0]);
 
+        env_reloads = getenv("UWSGI_RELOADS");
+        if (env_reloads) {
+                // convert env value to int
+                reloads = atoi(env_reloads);
+                reloads++;
+                // convert reloads to string
+                rlen = snprintf(env_reload_buf, 10, "%u", reloads) ;
+                if (rlen > 0) {
+                        env_reload_buf[rlen] = 0 ;
+                        if (setenv("UWSGI_RELOADS",env_reload_buf, 1)) {
+                                perror("setenv()");
+                        }
+                }
+        }
+        else {
+                fprintf(stderr,"setting UWSGI_RELOADS\n");
+                if (setenv("UWSGI_RELOADS","0", 1)) {
+                        perror("setenv()");
+                }
+        }
+
         socket_type_len = sizeof (int);
         if (!getsockopt (3, SOL_SOCKET, SO_TYPE, &socket_type, &socket_type_len)) {
-                if (socket_type == SOCK_STREAM) { 
+                if (socket_type == SOCK_STREAM && reloads > 0) { 
                         fprintf (stderr, "...fd 3 is a socket, i suppose this is a graceful reload of uWSGI, i will try to do my best...\n");
                         is_a_reload = 1;
@@ -1517 +1543 @@
                                 fprintf (stderr, "running %s\n", binary_path);
                                 strcpy (argv[0], binary_path);
-                                execve (binary_path, argv, envp);
+                                execve (binary_path, argv, environ);
                                 perror ("execve()");
                                 exit (1);