at 24.11-pre 1.3 kB view raw
1diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py 2index c65795b10..e56b6a6f3 100644 3--- a/pkg/pip/setup_pip.py 4+++ b/pkg/pip/setup_pip.py 5@@ -101,7 +101,7 @@ setup( 6 7 entry_points={ 8 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main', 9- 'pgadmin4-cli=pgadmin4.setup:main'], 10+ 'pgadmin4-cli=pgadmin4.setup:app'], 11 }, 12 13 ) 14diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py 15index 4c36dd1..a492365 100644 16--- a/web/pgadmin/model/__init__.py 17+++ b/web/pgadmin/model/__init__.py 18@@ -23,7 +23,6 @@ from flask_sqlalchemy import SQLAlchemy 19 from sqlalchemy.ext.mutable import MutableDict 20 import sqlalchemy.types as types 21 import uuid 22-import config 23 24 ########################################################################## 25 # 26@@ -41,10 +40,12 @@ SCHEMA_VERSION = 35 27 # 28 ########################################################################## 29 30+# hardcode poolsize and max_overflow due to a circular import (config imports model, 31+# model now tries to import config) 32 db = SQLAlchemy( 33 engine_options={ 34- 'pool_size': config.CONFIG_DATABASE_CONNECTION_POOL_SIZE, 35- 'max_overflow': config.CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW}) 36+ 'pool_size': 5, 37+ 'max_overflow': 100}) 38 39 40 USER_ID = 'user.id'