From 3afdd1d9941527e23cd7c05d2c15dd24a32de834 Mon Sep 17 00:00:00 2001 From: asciimoo Date: Sun, 19 Jan 2014 00:17:02 +0100 Subject: [enh] settings unification - new dependency: pyyaml --- searx/webapp.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 15ab17d15..de68d73e6 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -41,7 +41,7 @@ from searx.utils import highlight_content, html_to_text app = Flask(__name__) -app.secret_key = settings.secret_key +app.secret_key = settings['server']['secret_key'] opensearch_xml = ''' @@ -58,8 +58,8 @@ opensearch_xml = ''' def get_base_url(): - if settings.base_url: - hostname = settings.base_url + if settings['server']['base_url']: + hostname = settings['server']['base_url'] else: scheme = 'http' if request.is_secure: @@ -243,9 +243,9 @@ def run(): from gevent import monkey monkey.patch_all() - app.run(debug = settings.debug - ,use_debugger = settings.debug - ,port = settings.port + app.run(debug = settings['server']['debug'] + ,use_debugger = settings['server']['debug'] + ,port = settings['server']['port'] ) -- cgit v1.2.3 From f3749434f1545d802450dbed126e658b1643292f Mon Sep 17 00:00:00 2001 From: asciimoo Date: Sun, 19 Jan 2014 17:17:52 +0100 Subject: [fix] new settings import --- searx/webapp.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index de68d73e6..ec02e8f5c 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -22,13 +22,7 @@ import sys if __name__ == "__main__": sys.path.append(os.path.realpath(os.path.dirname(os.path.realpath(__file__))+'/../')) -# first argument is for specifying settings module, used mostly by robot tests -from sys import argv -if len(argv) == 2: - from importlib import import_module - settings = import_module('searx.' + argv[1]) -else: - from searx import settings +from searx import settings from flask import Flask, request, render_template, url_for, Response, make_response, redirect from searx.engines import search, categories, engines, get_engines_stats -- cgit v1.2.3