./bin/gmg commands upgraded to work with the new setup.
This commit is contained in:
parent
623bee73b1
commit
72c3ae046a
@ -23,9 +23,6 @@ def migrate_parser_setup(subparser):
|
|||||||
subparser.add_argument(
|
subparser.add_argument(
|
||||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||||
help="Config file used to set up environment")
|
help="Config file used to set up environment")
|
||||||
subparser.add_argument(
|
|
||||||
'-cs', '--app_section', default='app:mediagoblin',
|
|
||||||
help="Section of the config file where the app config is stored.")
|
|
||||||
|
|
||||||
|
|
||||||
def migrate(args):
|
def migrate(args):
|
||||||
|
@ -25,9 +25,6 @@ def shell_parser_setup(subparser):
|
|||||||
subparser.add_argument(
|
subparser.add_argument(
|
||||||
'-cf', '--conf_file', default='mediagoblin.ini',
|
'-cf', '--conf_file', default='mediagoblin.ini',
|
||||||
help="Config file used to set up environment")
|
help="Config file used to set up environment")
|
||||||
subparser.add_argument(
|
|
||||||
'-cs', '--app_section', default='app:mediagoblin',
|
|
||||||
help="Section of the config file where the app config is stored.")
|
|
||||||
|
|
||||||
|
|
||||||
SHELL_BANNER = """\
|
SHELL_BANNER = """\
|
||||||
|
@ -15,10 +15,6 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
from paste.deploy.loadwsgi import NicerConfigParser
|
|
||||||
|
|
||||||
from mediagoblin import app
|
from mediagoblin import app
|
||||||
|
|
||||||
|
|
||||||
@ -26,20 +22,6 @@ def setup_app(args):
|
|||||||
"""
|
"""
|
||||||
Setup the application after reading the mediagoblin config files
|
Setup the application after reading the mediagoblin config files
|
||||||
"""
|
"""
|
||||||
# Duplicated from from_celery.py, remove when we have the generic util
|
mgoblin_app = app.MediaGoblinApp(args.conf_file)
|
||||||
parser = NicerConfigParser(args.conf_file)
|
|
||||||
parser.read(args.conf_file)
|
|
||||||
parser._defaults.setdefault(
|
|
||||||
'here', os.path.dirname(os.path.abspath(args.conf_file)))
|
|
||||||
parser._defaults.setdefault(
|
|
||||||
'__file__', os.path.abspath(args.conf_file))
|
|
||||||
|
|
||||||
mgoblin_section = dict(parser.items(args.app_section))
|
|
||||||
mgoblin_conf = dict(
|
|
||||||
[(section_name, dict(parser.items(section_name)))
|
|
||||||
for section_name in parser.sections()])
|
|
||||||
|
|
||||||
mgoblin_app = app.paste_app_factory(
|
|
||||||
mgoblin_conf, **mgoblin_section)
|
|
||||||
|
|
||||||
return mgoblin_app
|
return mgoblin_app
|
||||||
|
Loading…
x
Reference in New Issue
Block a user