← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/session.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-01-21 11:48:06 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20110121114806-v8fvnnl6az4m4ohv
Tags: upstream-2011.1~bzr597
Import upstream version 2011.1~bzr597

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/session.py
36
36
    global _MAKER
37
37
    if not _MAKER:
38
38
        if not _ENGINE:
39
 
            _ENGINE = create_engine(FLAGS.sql_connection, echo=False)
 
39
            _ENGINE = create_engine(FLAGS.sql_connection,
 
40
                                    pool_recycle=FLAGS.sql_idle_timeout,
 
41
                                    echo=False)
40
42
        _MAKER = (sessionmaker(bind=_ENGINE,
41
43
                                autocommit=autocommit,
42
44
                                expire_on_commit=expire_on_commit))