Merge pull request #2243 from alphagov/disable-sa-preping

Revert "Enable pessimistic DB connection disconnect handling"
This commit is contained in:
Alexey Bezhan
2018-11-30 16:42:42 +00:00
committed by GitHub

View File

@@ -4,7 +4,7 @@ import string
import uuid import uuid
from flask import _request_ctx_stack, request, g, jsonify from flask import _request_ctx_stack, request, g, jsonify
from flask_sqlalchemy import SQLAlchemy as _SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from flask_marshmallow import Marshmallow from flask_marshmallow import Marshmallow
from flask_migrate import Migrate from flask_migrate import Migrate
from time import monotonic from time import monotonic
@@ -27,13 +27,6 @@ from app.encryption import Encryption
DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ" DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
DATE_FORMAT = "%Y-%m-%d" DATE_FORMAT = "%Y-%m-%d"
class SQLAlchemy(_SQLAlchemy):
def apply_pool_defaults(self, app, options):
_SQLAlchemy.apply_pool_defaults(self, app, options)
options["pool_pre_ping"] = True
db = SQLAlchemy() db = SQLAlchemy()
migrate = Migrate() migrate = Migrate()
ma = Marshmallow() ma = Marshmallow()