From a1ee937f3227188e309ff8305f8caf4923ded15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Sun, 6 Dec 2020 11:16:09 +0100
Subject: [PATCH] update helathcheck

---
 src/app.py | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/app.py b/src/app.py
index c4fa622..1419e65 100644
--- a/src/app.py
+++ b/src/app.py
@@ -35,7 +35,7 @@ if SENTRY_DSN:
 
 app = Flask(__name__)
 app.config[
-    'SQLALCHEMY_DATABASE_URI'] = f"postgresql://{POSTGRES_USERNAME}:{POSTGRES_PASSWORD}@{POSTGRES_HOSTNAME}:5432/{POSTGRES_DB}"
+    'SQLALCHEMY_DATABASE_URI'] = f"postgresql://{POSTGRES_USERNAME}:{POSTGRES_PASSWORD}@{POSTGRES_HOSTNAME}:5432/{POSTGRES_DB}?sslmode=require"
 app.config['EXCHANGE_NAME'] = RABBITMQ_EXCHANGE
 app.config['FLASK_PIKA_PARAMS'] = {'host': RABBITMQ_HOST,
                                    'username': RABBITMQ_USERNAME,
@@ -43,32 +43,15 @@ app.config['FLASK_PIKA_PARAMS'] = {'host': RABBITMQ_HOST,
                                    'port': 5672,
                                    'virtual_host': '/'}
 api = Api(app)
-health = HealthCheck(app, "/healthz")
+health = HealthCheck()
 db.init_app(app)
 ma.init_app(app)
 
 with app.app_context():
     db.create_all()
 
-formatter = logging.Formatter(
-    fmt="%(asctime)s - %(levelname)s - %(module)s - %(message)s"
-)
-
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-logger.addHandler(handler)
-
 api.add_resource(SampleResource, "/sample")
 api.add_resource(SampleParameterResource, '/sample/<tag>')
 
 health.add_check(health_database_status)
-
-if __name__ == "__main__":
-    app.run(
-        debug=bool(DEBUG),
-        host="0.0.0.0",
-        port=int(PORT),
-    )
+app.add_url_rule("/healthz", "healthcheck", view_func=lambda: health.run())