Changeset 248:232cdf418e68 for uwsgi.c

Timestamp:

03/03/10 14:10:51 (5 months ago)

Author:

roberto@…

Branch:

default

Message:

new binary-path options, useful for chroot reloads and cherokee wizard

Files:

• uwsgi.c (modified) (8 diffs)

uwsgi.c

@@ -505 +505 @@
         int blocking_workers = 0;
 
-        char *cwd;
+        char *cwd = NULL;
         int ready_to_reload = 0;
         int ready_to_die = 0;
@@ -520 +520 @@
         int socket_type = 0;
         socklen_t socket_type_len;
+
+        fprintf(stderr,"ARGV0 = %s %s\n", argv[0], argv[1]);
 
         /* anti signal bombing */
@@ -602 +604 @@
                 {"erlang-cookie", required_argument, 0, LONG_ARGS_ERLANG_COOKIE},
                 {"nagios", no_argument, &nagios, 1},
+                {"binary-path", required_argument, 0, LONG_ARGS_BINARY_PATH},
                 {0, 0, 0, 0}
         };
@@ -614 +617 @@
         uwsgi.rl.rlim_max = 0;
 
-        cwd = uwsgi_get_cwd ();
-        uwsgi.binary_path = malloc (strlen (argv[0]) + 1);
-        if (uwsgi.binary_path == NULL) {
-                perror ("malloc()");
-                exit (1);
-        }
-        strcpy (uwsgi.binary_path, argv[0]);
 
         env_reloads = getenv("UWSGI_RELOADS");
@@ -671 +667 @@
 #endif
 
+        if (uwsgi.binary_path == NULL) {
+                cwd = uwsgi_get_cwd ();
+                uwsgi.binary_path = malloc (strlen (argv[0]) + 1);
+                if (uwsgi.binary_path == NULL) {
+                        perror ("malloc()");
+                        exit (1);
+                }
+                strcpy (uwsgi.binary_path, argv[0]);
+        }
+
 #ifndef UNBIT
 #ifndef ROCK_SOLID
@@ -1309 +1315 @@
 #endif
                                 fprintf (stderr, "binary reloading uWSGI...\n");
-                                if (chdir (cwd)) {
-                                        perror ("chdir()");
-                                        exit (1);
+                                if (cwd) {
+                                        if (chdir (cwd)) {
+                                                perror ("chdir()");
+                                                exit (1);
+                                        }
                                 }
                                 /* check fd table (a module can obviosly open some fd on initialization...) */
@@ -1328 +1336 @@
                                 }
                                 fprintf (stderr, "running %s\n", uwsgi.binary_path);
-                                strcpy (argv[0], uwsgi.binary_path);
+                                argv[0] = uwsgi.binary_path ;
+                                //strcpy (argv[0], uwsgi.binary_path);
                                 execve (uwsgi.binary_path, argv, environ);
                                 perror ("execve()");
@@ -2319 +2328 @@
                 case LONG_ARGS_UID:
                         uwsgi.uid = atoi (optarg);
+                        break;
+                case LONG_ARGS_BINARY_PATH:
+                        uwsgi.binary_path = optarg;
                         break;
 #ifdef UWSGI_ERLANG