added --emperor-wrapper

This commit is contained in:
Unbit
2013-09-23 14:38:42 +02:00
parent f730023e88
commit be5f67906e
3 changed files with 3 additions and 1 deletions
+1 -1
View File
@@ -1039,7 +1039,7 @@ static void uwsgi_emperor_spawn_vassal(struct uwsgi_instance *n_ui) {
char **vassal_argv = uwsgi_malloc(sizeof(char *) * counter);
// set args
vassal_argv[0] = uwsgi.binary_path;
vassal_argv[0] = uwsgi.emperor_wrapper ? uwsgi.emperor_wrapper: uwsgi.binary_path;
char *colon = NULL;
+1
View File
@@ -173,6 +173,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
{"master", no_argument, 'M', "enable master process", uwsgi_opt_true, &uwsgi.master_process, 0},
{"honour-stdin", no_argument, 0, "do not remap stdin to /dev/null", uwsgi_opt_true, &uwsgi.honour_stdin, 0},
{"emperor", required_argument, 0, "run the Emperor", uwsgi_opt_add_string_list, &uwsgi.emperor, 0},
{"emperor-wrapper", required_argument, 0, "set a binary wrapper for vassals", uwsgi_opt_set_str, &uwsgi.emperor_wrapper, 0},
{"emperor-nofollow", no_argument, 0, "do not follow symlinks when checking for mtime", uwsgi_opt_true, &uwsgi.emperor_nofollow, 0},
{"emperor-procname", required_argument, 0, "set the Emperor process name", uwsgi_opt_set_str, &uwsgi.emperor_procname, 0},
{"emperor-freq", required_argument, 0, "set the Emperor scan frequency (default 3 seconds)", uwsgi_opt_set_int, &uwsgi.emperor_freq, 0},
+1
View File
@@ -1870,6 +1870,7 @@ struct uwsgi_server {
int emperor_clone;
char *pivot_root;
#endif
char *emperor_wrapper;
#ifdef __FreeBSD__
char *jail;