accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-24 23:48:24 +00:00
Code Issues Releases Activity

Better upgrade message and retry-upgrade

Browse Source
This commit is contained in:
Pratik Vyas 2015-03-19 11:55:43 +05:30
parent 52bfaa0272
commit 5080e06a4c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bench/cli.py
View File

@ -17,7 +17,7 @@ from .utils import (build_assets, patch_sites, exec_cmd, update_bench, get_env_c
pre_upgrade) pre_upgrade)
from .app import get_app as _get_app from .app import get_app as _get_app
from .app import new_app as _new_app from .app import new_app as _new_app
from .app import pull_all_apps, get_apps, get_current_frappe_version, is_version_upgrade, switch_to_v4, switch_to_master from .app import pull_all_apps, get_apps, get_current_frappe_version, is_version_upgrade, switch_to_v4, switch_to_master, switch_to_develop
from .config import generate_nginx_config, generate_supervisor_config, generate_redis_config from .config import generate_nginx_config, generate_supervisor_config, generate_redis_config
from .production_setup import setup_production as _setup_production from .production_setup import setup_production as _setup_production
from .migrate_to_v5 import migrate_to_v5 from .migrate_to_v5 import migrate_to_v5
@ -220,10 +220,11 @@ def update(pull=False, patch=False, build=False, bench=False, auto=False, restar
if version_upgrade and not upgrade: if version_upgrade and not upgrade:
print print
print print
print "This update will cause a major version change in Frappe/ERPNext from {0} to {1}.".format(*version_upgrade) print "This update will cause a major version change in Frappe/ERPNext from {0} to {1} (beta).".format(*version_upgrade)
print "This would take significant time to migrate and might break custom apps. Please run `bench update --upgrade` to confirm." print "This would take significant time to migrate and might break custom apps. Please run `bench update --upgrade` to confirm."
print print
print "You can also pin your bench to {0} by running `bench swtich-to-v{0}`".format(version_upgrade[0]) # print "You can also pin your bench to {0} by running `bench swtich-to-v{0}`".format(version_upgrade[0])
print "You can stay on the latest stable release by running `bench switch-to-master` or pin your bench to {0} by running `bench swtich-to-v{0}`".format(version_upgrade[0])
sys.exit(1) sys.exit(1)
elif not version_upgrade and upgrade: elif not version_upgrade and upgrade:
upgrade = False upgrade = False
@ -252,6 +253,14 @@ def update(pull=False, patch=False, build=False, bench=False, auto=False, restar
print "https://frappe.io/buy - Donate to help make better free and open source tools" print "https://frappe.io/buy - Donate to help make better free and open source tools"
print print
@click.command('retry-upgrade')
@click.option('--version', default=5)
def retry_upgrade(version):
pull_all_apps()
patch_sites()
build_assets()
post_upgrade(version-1, version)
def restart_update(kwargs): def restart_update(kwargs):
args = ['--'+k for k, v in kwargs.items() if v] args = ['--'+k for k, v in kwargs.items() if v]
os.execv(sys.argv[0], sys.argv[:2] + args) os.execv(sys.argv[0], sys.argv[:2] + args)
@ -558,3 +567,4 @@ bench.add_command(_prime_wheel_cache)
bench.add_command(_release) bench.add_command(_release)
bench.add_command(patch) bench.add_command(patch)
bench.add_command(set_url_root) bench.add_command(set_url_root)
bench.add_command(retry_upgrade)

1
bench/utils.py
View File

@ -444,6 +444,7 @@ def post_upgrade(from_ver, to_ver, bench='.'):
generate_redis_config(bench=bench) generate_redis_config(bench=bench)
generate_supervisor_config(bench=bench) generate_supervisor_config(bench=bench)
generate_nginx_config(bench=bench) generate_nginx_config(bench=bench)
setup_procfile(bench=bench)
print "As you have setup your bench for production, you will have to reload configuration for nginx and supervisor" print "As you have setup your bench for production, you will have to reload configuration for nginx and supervisor"
print "To complete the migration, please run the following commands" print "To complete the migration, please run the following commands"
print print