Skip to content

Commit

Permalink
Merge branch 'develop' into upgrade_python_deps
Browse files Browse the repository at this point in the history
  • Loading branch information
puehringer committed Dec 22, 2022
2 parents 0c34551 + 840fb49 commit 82c5a73
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
5 changes: 4 additions & 1 deletion dist/scss/vendors/_lineup.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/scss/vendors/_lineup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,13 @@ $lu_include_font_awesome: false !default;
.lu-dialog {
.lu-checkbox {
display: flex;
align-items: baseline;
gap: 5px;
margin: unset;
}

.lu-color-gradient {
margin: 5px;
}
}

.lu-dialog.lu-more-options {
Expand Down
9 changes: 7 additions & 2 deletions tdp_core/dbview.py
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,13 @@ def dump(self, name):
return OrderedDict(name=name, description=self.description)

def create_engine(self, config) -> Engine:
engine_options = config.get("engine", {})
return sqlalchemy.create_engine(self.dburl, pool_size=30, pool_pre_ping=True, **engine_options)
engine_options = dict(
# Increase the pool size to 30 to avoid "too many clients" errors
pool_size=30,
pool_pre_ping=True,
**config.get("engine", {}),
)
return sqlalchemy.create_engine(self.dburl, **engine_options)

def create_sessionmaker(self, engine) -> sessionmaker:
return sessionmaker(bind=engine)

0 comments on commit 82c5a73

Please # to comment.