return unauthorized when token is invalid

Change-Id: Id9a5514ff6d19e97e2f86fb5632508f308c8834c

compass/db/api/database.py

@@ -45,7 +45,15 @@ def init(database_url=None):
     if not database_url:
         database_url = setting.SQLALCHEMY_DATABASE_URI
     logging.info('init database %s', database_url)
-    ENGINE = create_engine(database_url, convert_unicode=True)
+    root_logger = logging.getLogger()
+    fine_debug = root_logger.isEnabledFor(logging.DEBUG - 1)
+    if fine_debug:
+        logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
+    ENGINE = create_engine(
+        database_url, convert_unicode=True,
+        pool_recycle=setting.SQLALCHEMY_DATABASE_POOL_RECYCLE_PERIOD,
+        pool_size=setting.SQLALCHEMY_DATABASE_POOL_SIZE
+    )
     SESSION.configure(bind=ENGINE)
     SCOPED_SESSION = scoped_session(SESSION)
     models.BASE.query = SCOPED_SESSION.query_property()

compass/db/api/user.py

@@ -245,7 +245,7 @@ def get_user_object_from_token(session, token):
         token=token, expire_timestamp=expire_timestamp
     )
     if not user_token:
-        raise exception.Forbidden(
+        raise exception.Unauthorized(
             'invalid user token: %s' % token
         )
     user_dict = utils.get_db_object(

compass/tests/db/api/test_user.py

@@ -93,9 +93,9 @@ class TestGetRecordCleanToken(BaseTest):
         )
         self.assertIsNotNone(token)
 
-    def test_get_user_object_from_token_forbidden(self):
+    def test_get_user_object_from_token_unauthorized(self):
         self.assertRaises(
-            exception.Forbidden,
+            exception.Unauthorized,
             user_api.get_user_object_from_token,
             'token'
         )

compass/utils/setting_wrapper.py

@@ -26,6 +26,8 @@ import os.path
 # default setting
 CONFIG_DIR = '/etc/compass'
 SQLALCHEMY_DATABASE_URI = 'sqlite://'
+SQLALCHEMY_DATABASE_POOL_SIZE = 10
+SQLALCHEMY_DATABASE_POOL_RECYCLE_PERIOD = 7200
 INSTALLATION_LOGDIR = {
     'CobblerInstaller': '/var/log/cobbler/anamon',
     'ChefInstaller': '/var/log/cobbler/anamon'