Merge branch 'mig5-fix_persistent_url'

This commit is contained in:
Micah Lee 2018-01-17 16:05:47 -08:00
commit ec6adfdb8f
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -79,7 +79,6 @@ def main(cwd=None):
settings = Settings(config) settings = Settings(config)
settings.load()
# Start the Onion object # Start the Onion object
onion = Onion() onion = Onion()
@ -129,6 +128,7 @@ def main(cwd=None):
app.shutdown_timer.start() app.shutdown_timer.start()
# Save the web slug if we are using a persistent private key # Save the web slug if we are using a persistent private key
settings.load()
if settings.get('save_private_key'): if settings.get('save_private_key'):
if not settings.get('slug'): if not settings.get('slug'):
settings.set('slug', web.slug) settings.set('slug', web.slug)