From 4b3c34469d75feeb421e2c1468da03a38bfaec51 Mon Sep 17 00:00:00 2001 From: "roberto@oneiric64" Date: Fri, 16 Dec 2011 11:51:07 +0100 Subject: [PATCH] fixed bin-name implicit plugin loading --- uwsgi.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/uwsgi.c b/uwsgi.c index 28c15bfc..d0cd424a 100644 --- a/uwsgi.c +++ b/uwsgi.c @@ -1232,13 +1232,20 @@ int main(int argc, char *argv[], char *envp[]) { #ifdef UWSGI_DEBUG uwsgi_log("executable name: %s\n", uwsgi.binary_path); #endif - char *p = strrchr(uwsgi.binary_path, '/'); - if (p == NULL) p = uwsgi.binary_path; + + char *original_proc_name = getenv("UWSGI_ORIGINAL_PROC_NAME"); + if (!original_proc_name) { + // here we use argv[0]; + original_proc_name = argv[0]; + setenv("UWSGI_ORIGINAL_PROC_NAME", original_proc_name, 1); + } + char *p = strrchr(original_proc_name, '/'); + if (p == NULL) p = original_proc_name; p = strstr(p, "uwsgi_"); if (p != NULL) { plugins_requested = strchr(p, '_'); if (plugins_requested != NULL && *(++plugins_requested) != '\0') { - uwsgi_log("plugin = %s\n", plugins_requested); + uwsgi_log("[uwsgi] implicit plugin requested %s\n", argv[0], plugins_requested); uwsgi_load_plugin(0, plugins_requested, NULL, 0); } }