move initialization of up.loaders to uwsgi_python_preinit_apps, fixes #968

This commit is contained in:
C Anthony Risinger
2015-07-16 14:29:46 -05:00
parent f1ef2eecfe
commit d01bd639a7
+11 -11
View File
@@ -1076,6 +1076,17 @@ void uwsgi_python_preinit_apps() {
if (up.pre_initialized) goto ready;
up.pre_initialized = 1;
// setup app loaders
up.loaders[LOADER_DYN] = uwsgi_dyn_loader;
up.loaders[LOADER_UWSGI] = uwsgi_uwsgi_loader;
up.loaders[LOADER_FILE] = uwsgi_file_loader;
up.loaders[LOADER_PECAN] = uwsgi_pecan_loader;
up.loaders[LOADER_PASTE] = uwsgi_paste_loader;
up.loaders[LOADER_EVAL] = uwsgi_eval_loader;
up.loaders[LOADER_MOUNT] = uwsgi_mount_loader;
up.loaders[LOADER_CALLABLE] = uwsgi_callable_loader;
up.loaders[LOADER_STRING_CALLABLE] = uwsgi_string_callable_loader;
init_pyargv();
init_uwsgi_embedded_module();
@@ -1136,17 +1147,6 @@ void uwsgi_python_init_apps() {
up.current_frame = uwsgi_malloc(sizeof(struct _frame)*uwsgi.async);
}
// setup app loaders
up.loaders[LOADER_DYN] = uwsgi_dyn_loader;
up.loaders[LOADER_UWSGI] = uwsgi_uwsgi_loader;
up.loaders[LOADER_FILE] = uwsgi_file_loader;
up.loaders[LOADER_PECAN] = uwsgi_pecan_loader;
up.loaders[LOADER_PASTE] = uwsgi_paste_loader;
up.loaders[LOADER_EVAL] = uwsgi_eval_loader;
up.loaders[LOADER_MOUNT] = uwsgi_mount_loader;
up.loaders[LOADER_CALLABLE] = uwsgi_callable_loader;
up.loaders[LOADER_STRING_CALLABLE] = uwsgi_string_callable_loader;
struct uwsgi_string_list *upli = up.import_list;
while(upli) {
if (strchr(upli->value, '/') || uwsgi_endswith(upli->value, ".py")) {