From f09efcb0ae4a96f23f44a4046b087050c537bac1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 10 Feb 2015 12:37:51 +0530 Subject: [PATCH] [minor] fixes for new-app and new-site --- bench/app.py | 3 ++- bench/utils.py | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bench/app.py b/bench/app.py index 011f68c8..2a576136 100644 --- a/bench/app.py +++ b/bench/app.py @@ -50,7 +50,8 @@ def get_app(app, git_url, branch=None, bench='.', build_asset_files=True): def new_app(app, bench='.'): logger.info('creating new app {}'.format(app)) - exec_cmd("{frappe} --make_app {apps}".format(frappe=get_frappe(bench=bench), apps=os.path.join(bench, 'apps'))) + exec_cmd("{frappe} --make_app {apps} {app}".format(frappe=get_frappe(bench=bench), + apps=os.path.join(bench, 'apps'), app=app)) install_app(app, bench=bench) def install_app(app, bench='.'): diff --git a/bench/utils.py b/bench/utils.py index 2d2d7219..acb65f30 100644 --- a/bench/utils.py +++ b/bench/utils.py @@ -75,12 +75,14 @@ worker: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker' workerbeat: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app beat -s scheduler.schedule'""") def new_site(site, mariadb_root_password=None, admin_password=None, bench='.'): + import hashlib logger.info('creating new site {}'.format(site)) mariadb_root_password_fragment = '--root_password {}'.format(mariadb_root_password) if mariadb_root_password else '' admin_password_fragment = '--admin_password {}'.format(admin_password) if admin_password else '' - exec_cmd("{frappe} --install {site} {site} {mariadb_root_password_fragment} {admin_password_fragment}".format( + exec_cmd("{frappe} {site} --install {db_name} {mariadb_root_password_fragment} {admin_password_fragment}".format( frappe=get_frappe(bench=bench), site=site, + db_name = hashlib.sha1(site).hexdigest()[:10], mariadb_root_password_fragment=mariadb_root_password_fragment, admin_password_fragment=admin_password_fragment ), cwd=os.path.join(bench, 'sites')) @@ -95,7 +97,7 @@ def build_assets(bench='.'): def get_sites(bench='.'): sites_dir = os.path.join(bench, "sites") - sites = [site for site in os.listdir(sites_dir) + sites = [site for site in os.listdir(sites_dir) if os.path.isdir(os.path.join(sites_dir, site)) and site not in ('assets',)] return sites @@ -182,7 +184,7 @@ def get_program(programs): def get_process_manager(): return get_program(['foreman', 'forego', 'honcho']) - + def start(): program = get_process_manager() if not program: