From dfab80447b7d4e829d73b48c539104acaa948d8f Mon Sep 17 00:00:00 2001 From: "roberto@dexter" Date: Wed, 24 Aug 2011 18:24:45 +0200 Subject: [PATCH] added a check for Riccardo --- plugins/python24/uwsgiplugin.py | 2 +- plugins/python25/uwsgiplugin.py | 2 +- plugins/python26/uwsgiplugin.py | 2 +- plugins/python27/uwsgiplugin.py | 2 +- plugins/python30/uwsgiplugin.py | 2 +- plugins/python31/uwsgiplugin.py | 2 +- plugins/python32/uwsgiplugin.py | 2 +- uwsgiconfig.py | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/python24/uwsgiplugin.py b/plugins/python24/uwsgiplugin.py index c79e5c54..0c48adcc 100644 --- a/plugins/python24/uwsgiplugin.py +++ b/plugins/python24/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python24' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python2.4-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python25/uwsgiplugin.py b/plugins/python25/uwsgiplugin.py index e5facb80..ab7c037f 100644 --- a/plugins/python25/uwsgiplugin.py +++ b/plugins/python25/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python25' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python2.5-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python26/uwsgiplugin.py b/plugins/python26/uwsgiplugin.py index 8728769d..ef0a3c46 100644 --- a/plugins/python26/uwsgiplugin.py +++ b/plugins/python26/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python26' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python2.6-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python27/uwsgiplugin.py b/plugins/python27/uwsgiplugin.py index bf076cec..30f3e3f6 100644 --- a/plugins/python27/uwsgiplugin.py +++ b/plugins/python27/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python27' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python2.7-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python30/uwsgiplugin.py b/plugins/python30/uwsgiplugin.py index cc0578c1..366aa3ac 100644 --- a/plugins/python30/uwsgiplugin.py +++ b/plugins/python30/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python30' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python3.0-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python31/uwsgiplugin.py b/plugins/python31/uwsgiplugin.py index 3e3d04f5..d264fef6 100644 --- a/plugins/python31/uwsgiplugin.py +++ b/plugins/python31/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python31' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python3.1-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/plugins/python32/uwsgiplugin.py b/plugins/python32/uwsgiplugin.py index d0adec92..8289303d 100644 --- a/plugins/python32/uwsgiplugin.py +++ b/plugins/python32/uwsgiplugin.py @@ -2,7 +2,7 @@ import os,sys NAME='python32' -GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'gil', 'uwsgi_pymodule', 'profiler']) +GCC_LIST = map(lambda x: '../python/' + x, ['python_plugin', 'pyutils', 'pyloader', 'wsgi_handlers', 'wsgi_headers', 'wsgi_subhandler', 'web3_subhandler', 'pump_subhandler', 'gil', 'uwsgi_pymodule', 'profiler', 'symimporter']) CFLAGS = os.popen('python3.2-config --cflags').read().rstrip().split() CFLAGS.append('-Wno-unused-parameter') diff --git a/uwsgiconfig.py b/uwsgiconfig.py index 2c2a26ad..6613733c 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py @@ -193,6 +193,8 @@ class uConf(object): def __init__(self, filename): self.config = ConfigParser.ConfigParser() print("using profile: %s" % filename) + if not os.path.exists(filename): + raise Exception("profile not found !!!") self.config.read(filename) self.gcc_list = ['utils', 'protocol', 'socket', 'logging', 'master', 'master_utils', 'emperor', 'notify', 'plugins', 'lock', 'cache', 'queue', 'event', 'signal', 'rpc', 'gateway', 'loop', 'lib/rbtree', 'lib/amqp', 'rb_timers', 'uwsgi']