archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Refuse to merge projects when SERVER_NAME is unset

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-02-13 16:50:37 +01:00
parent 1f2fb774b4
commit f79642d69f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pillar/cli/operations.py
View File

@ -130,6 +130,11 @@ def merge_project(src_proj_url, dest_proj_url):
logging.getLogger('pillar').setLevel(logging.INFO) logging.getLogger('pillar').setLevel(logging.INFO)
log.info('Current server name is %s', current_app.config['SERVER_NAME'])
if not current_app.config['SERVER_NAME']:
log.fatal('SERVER_NAME configuration is missing, would result in malformed file links.')
return 5
# Parse CLI args and get source and destination projects. # Parse CLI args and get source and destination projects.
projs_coll = current_app.db('projects') projs_coll = current_app.db('projects')
src_proj = projs_coll.find_one({'url': src_proj_url}, projection={'_id': 1}) src_proj = projs_coll.find_one({'url': src_proj_url}, projection={'_id': 1})
@ -149,7 +154,8 @@ def merge_project(src_proj_url, dest_proj_url):
print() print()
try: try:
input(f'Press ENTER to start moving ALL NODES AND FILES from {spid} to {dpid}') input(f'Press ENTER to start moving ALL NODES AND FILES '
f'from {src_proj_url} to {dest_proj_url}')
except KeyboardInterrupt: except KeyboardInterrupt:
print() print()
print('Aborted') print('Aborted')