Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pulsar/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
5 changes: 3 additions & 2 deletions scripts/pulsar
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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]"
Expand Down