Skip to content

Commit

Permalink
limit max pool connection. fixed sacrud/pyramid_sacrud#121
Browse files Browse the repository at this point in the history
  • Loading branch information
uralbash committed May 6, 2016
1 parent a254d2f commit cc88331
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 3 deletions.
35 changes: 35 additions & 0 deletions example/development.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,38 @@ ps_alchemy.items_per_page = 6
use = egg:waitress#main
host = 0.0.0.0
port = 6543

###
# logging configuration
# http://docs.pylonsproject.org/projects/pyramid/en/1.6-branch/narr/logging.html
###

[loggers]
keys = root, sqlalchemy

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = INFO
handlers = console

[logger_sqlalchemy]
level = INFO
handlers =
qualname = sqlalchemy.engine
# "level = INFO" logs SQL queries.
# "level = DEBUG" logs SQL queries and results.
# "level = WARN" logs neither. (Recommended for production systems.)

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s
8 changes: 5 additions & 3 deletions ps_alchemy/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,18 @@ def ps_crud(self):

@property
def dbsession(self):
return self._dbsession or self._default_dbsession
if not self._dbsession:
self._dbsession = self._default_dbsession
return self._dbsession

@dbsession.setter
def dbsession(self, dbsession):
self._dbsession = dbsession

@property
def _default_dbsession(self):
engine = sqlalchemy.engine_from_config(get_current_registry().settings)
registry = get_current_registry()
engine = sqlalchemy.engine_from_config(registry.settings)
session = scoped_session(
sessionmaker(extension=ZopeTransactionExtension())
)
Expand Down Expand Up @@ -247,4 +250,3 @@ def __getitem__(self, name):
class MassActionResource(BaseResource):

__name__ = 'mass_action'

0 comments on commit cc88331

Please sign in to comment.