git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a lingering raise
[sfa.git]
/
sfa
/
storage
/
alchemy.py
diff --git
a/sfa/storage/alchemy.py
b/sfa/storage/alchemy.py
index
84c987f
..
fb8dfac
100644
(file)
--- a/
sfa/storage/alchemy.py
+++ b/
sfa/storage/alchemy.py
@@
-14,7
+14,7
@@
from sfa.util.sfalogging import logger
class Alchemy:
def __init__ (self, config):
class Alchemy:
def __init__ (self, config):
- dbname
=
"sfa"
+ dbname
=
"sfa"
# will be created lazily on-demand
self._session = None
# the former PostgreSQL.py used the psycopg2 directly and was doing
# will be created lazily on-demand
self._session = None
# the former PostgreSQL.py used the psycopg2 directly and was doing
@@
-39,7
+39,7
@@
class Alchemy:
except:
pass
self.engine=None
except:
pass
self.engine=None
- raise Exception
,"Could not connect to database %s as %s with psycopg2"%(dbname,config.SFA_DB_USER
)
+ raise Exception
("Could not connect to database %s as %s with psycopg2"%(dbname,config.SFA_DB_USER)
)
# expects boolean True: debug is ON or False: debug is OFF
# expects boolean True: debug is ON or False: debug is OFF
@@
-53,12
+53,12
@@
class Alchemy:
if self._session is None:
Session=sessionmaker ()
self._session=Session(bind=self.engine)
if self._session is None:
Session=sessionmaker ()
self._session=Session(bind=self.engine)
- logger.
info
('alchemy.global_session created session %s'%self._session)
+ logger.
debug
('alchemy.global_session created session %s'%self._session)
return self._session
def close_global_session (self):
if self._session is None: return
return self._session
def close_global_session (self):
if self._session is None: return
- logger.
info
('alchemy.close_global_session %s'%self._session)
+ logger.
debug
('alchemy.close_global_session %s'%self._session)
self._session.close()
self._session=None
self._session.close()
self._session=None
@@
-66,11
+66,11
@@
class Alchemy:
def session (self):
Session=sessionmaker()
session=Session (bind=self.engine)
def session (self):
Session=sessionmaker()
session=Session (bind=self.engine)
- logger.
info
('alchemy.session created session %s'%session)
+ logger.
debug
('alchemy.session created session %s'%session)
return session
def close_session (self, session):
return session
def close_session (self, session):
- logger.
info
('alchemy.close_session closed session %s'%session)
+ logger.
debug
('alchemy.close_session closed session %s'%session)
session.close()
####################
session.close()
####################