Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / storage / alchemy.py

diff --git a/sfa/storage/alchemy.py b/sfa/storage/alchemy.py
index 7e00116..e9f96dd 100644 (file)
--- a/sfa/storage/alchemy.py
+++ b/sfa/storage/alchemy.py
@@ -4,7 +4,6 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
 from sqlalchemy import Column, Integer, String
-from sqlalchemy.orm import relationship, backref
 from sqlalchemy import ForeignKey
 
 from sfa.util.sfalogging import logger
@@ -32,6 +31,7 @@ class Alchemy:
             (config.SFA_DB_USER,config.SFA_DB_PASSWORD,config.SFA_DB_HOST,config.SFA_DB_PORT,dbname)
         for url in [ unix_url, tcp_url ] :
             try:
+                logger.debug("Trying db URL %s"%url)
                 self.engine = create_engine (url)
                 self.check()
                 self.url=url
@@ -39,8 +39,8 @@ class Alchemy:
             except:
                 pass
         self.engine=None
-        raise Exception,"Could not connect to database"
-                
+        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
     def debug (self, echo):