pyrox.dev
1 pkg/pip/setup_pip.py | 5 ++++-
2 web/setup.py | 14 ++++++++------
3 2 files changed, 12 insertions(+), 7 deletions(-)
4
5diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py
6index 5592d1b04..131eaa1ed 100644
7--- a/pkg/pip/setup_pip.py
8+++ b/pkg/pip/setup_pip.py
9@@ -95,7 +95,10 @@ setup(
10 },
11
12 entry_points={
13- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'],
14+ 'console_scripts': [
15+ 'pgadmin4=pgadmin4.pgAdmin4:main',
16+ 'pgadmin4-setup=pgadmin4.setup:main'
17+ ],
18 },
19
20 )
21diff --git a/web/setup.py b/web/setup.py
22index 2204ffb..d5fda9f 100644
23--- a/web/setup.py
24+++ b/web/setup.py
25@@ -14,7 +14,6 @@ import argparse
26 import os
27 import sys
28 import builtins
29-import config
30
31 # Grab the SERVER_MODE if it's been set by the runtime
32 if 'SERVER_MODE' in globals():
33@@ -91,6 +90,9 @@ def load_servers(args):
34 def setup_db(app):
35 """Setup the configuration database."""
36
37+ # here we need an additional import, since the call to setup_db changed
38+ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py
39+ import config
40 create_app_data_directory(config)
41
42 print("pgAdmin 4 - Application Initialisation")
43@@ -139,8 +141,9 @@ def clear_servers():
44 clear_database_servers(load_user, True)
45
46
47-if __name__ == '__main__':
48+def main():
49 # Configuration settings
50+ import config
51 parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB')
52
53 exp_group = parser.add_argument_group('Dump server config')
54@@ -191,3 +194,6 @@ if __name__ == '__main__':
55 else:
56 app = create_app()
57 setup_db(app)
58+
59+if __name__ == '__main__':
60+ main()
61
62diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py
63index 4c36dd1..a492365 100644
64--- a/web/pgadmin/model/__init__.py
65+++ b/web/pgadmin/model/__init__.py
66@@ -23,7 +23,6 @@ from flask_sqlalchemy import SQLAlchemy
67 from sqlalchemy.ext.mutable import MutableDict
68 import sqlalchemy.types as types
69 import uuid
70-import config
71
72 ##########################################################################
73 #
74@@ -41,10 +40,12 @@ SCHEMA_VERSION = 35
75 #
76 ##########################################################################
77
78+# hardcode poolsize and max_overflow due to a circular import (config imports model,
79+# model now tries to import config)
80 db = SQLAlchemy(
81 engine_options={
82- 'pool_size': config.CONFIG_DATABASE_CONNECTION_POOL_SIZE,
83- 'max_overflow': config.CONFIG_DATABASE_CONNECTION_MAX_OVERFLOW})
84+ 'pool_size': 5,
85+ 'max_overflow': 100})
86
87
88 USER_ID = 'user.id'