cleanup--i think this will work everywhere and is cleaner.

pull/23/head
Steve Hay 2 years ago
parent 4cb3ea9cc2
commit f01d151850

@ -38,21 +38,13 @@ config.show_cli_button = bool(strtobool(environ["PASTEY_SHOW_CLI_BUTTON"])) if "
config.force_https_links = bool(strtobool(environ["PASTEY_FORCE_HTTPS_LINKS"])) if "PASTEY_FORCE_HTTPS_LINKS" in environ else config.force_https_links config.force_https_links = bool(strtobool(environ["PASTEY_FORCE_HTTPS_LINKS"])) if "PASTEY_FORCE_HTTPS_LINKS" in environ else config.force_https_links
config.override_domain = environ["PASTEY_OVERRIDE_DOMAIN"] if "PASTEY_OVERRIDE_DOMAIN" in environ else config.override_domain config.override_domain = environ["PASTEY_OVERRIDE_DOMAIN"] if "PASTEY_OVERRIDE_DOMAIN" in environ else config.override_domain
# Main loop
if __name__ == "__main__":
# Print configuration
print("=====================================")
loaded_config['pastey_version'] = pastey_version loaded_config['pastey_version'] = pastey_version
print("Pastey version ", pastey_version) app.logger.info("Pastey version %s", pastey_version)
print("USING THE FOLLOWING CONFIGURATION:") app.logger.info("USING THE FOLLOWING CONFIGURATION:")
print("=====================================")
for option in dir(config): for option in dir(config):
if not option.startswith("__"): if not option.startswith("__"):
loaded_config[option] = eval("config.%s" % option) loaded_config[option] = eval("config.%s" % option)
print(option, ": ", loaded_config[option]) app.logger.info("%s: %s", option, loaded_config[option])
print("=====================================")
# Register error handlers # Register error handlers
app.register_error_handler(404, routes.page_not_found) app.register_error_handler(404, routes.page_not_found)
@ -62,19 +54,6 @@ if __name__ == "__main__":
purge_thread = Thread(target=functions.purge_expired_pastes, daemon=True) purge_thread = Thread(target=functions.purge_expired_pastes, daemon=True)
purge_thread.start() purge_thread.start()
# Main loop
if __name__ == "__main__":
app.run(host=config.listen_address, port=config.listen_port) app.run(host=config.listen_address, port=config.listen_port)
else:
# Register error handlers
app.register_error_handler(404, routes.page_not_found)
app.register_error_handler(401, routes.unauthorized)
# Start purging expired pastes thread
purge_thread = Thread(target=functions.purge_expired_pastes, daemon=True)
purge_thread.start()
loaded_config['pastey_version'] = pastey_version
for option in dir(config):
if not option.startswith("__"):
loaded_config[option] = eval("config.%s" % option)
print(option, ": ", loaded_config[option])

Loading…
Cancel
Save