diff --git a/pulsar/main.py b/pulsar/main.py index becaf65e..ef4f4d14 100644 --- a/pulsar/main.py +++ b/pulsar/main.py @@ -196,7 +196,7 @@ def apply_env_overrides_and_defaults(conf): def load_app_configuration(ini_path=None, app_conf_path=None, app_name=None, local_conf=None, config_dir=PULSAR_CONFIG_DIR): """ """ - if ini_path and local_conf is None: + if os.path.exists(ini_path) and local_conf is None: from pulsar.util.pastescript.loadwsgi import ConfigLoader local_conf = ConfigLoader(ini_path).app_context(app_name).config() local_conf = local_conf or {} diff --git a/scripts/pulsar b/scripts/pulsar index f6908cdf..695c0ce9 100755 --- a/scripts/pulsar +++ b/scripts/pulsar @@ -116,8 +116,10 @@ then MODE="circusd" elif hash chaussette 2>/dev/null; then MODE="chaussette" - else + elif hash paster 2>/dev/null; then MODE="paster" + else + MODE="webless" fi fi @@ -140,7 +142,6 @@ elif [ "$MODE" == "webless" ]; then pulsar-main else # Running locally. - PROJECT_DIRECTORY=$PULSAR_SCRIPTS_DIR/.. cd $PROJECT_DIRECTORY export PYTHONPATH=.:$PYTHONPATH echo "Starting pulsar with command [python pulsar/main.py]"