Merge branch 'develop' of github.com:tracim/tracim_backend into feature/578_add_api_for_workspace/apps

tracim/lib/utils/request.py

@@ -42,6 +42,8 @@ class TracimRequest(Request):
         # User found from request headers, content, distinct from authenticated
         # user
         self._user_candidate = None  # type: User
+        # INFO - G.M - 18-05-2018 - Close db at the end of the request
+        self.add_finished_callback(self._cleanup)
 
     @property
     def current_workspace(self) -> Workspace:
@@ -98,6 +100,20 @@ class TracimRequest(Request):
             self.candidate_user = get_candidate_user(self)
         return self._user_candidate
 
+    def _cleanup(self, request: 'TracimRequest') -> None:
+        """
+        Close dbsession at the end of the request in order to avoid exception
+        about not properly closed session or "object created in another thread"
+        issue
+        see https://github.com/tracim/tracim_backend/issues/62
+        :param request: same as self, request
+        :return: nothing.
+        """
+        self._current_user = None
+        self._current_workspace = None
+        self.dbsession.close()
+
+
     @candidate_user.setter
     def candidate_user(self, user: User) -> None:
         if self._user_candidate is not None:

tracim/lib/webdav/middlewares.py

@@ -263,13 +263,17 @@ class TracimEnv(BaseMiddleware):
         self.app_config.configure_filedepot()
 
     def __call__(self, environ, start_response):
-        with transaction.manager as tm:
-            dbsession = get_tm_session(self.session_factory, transaction.manager)
-            environ['tracim_tm'] = tm
-            environ['tracim_dbsession'] = dbsession
-            environ['tracim_cfg'] = self.app_config
-
-            return self._application(environ, start_response)
+        # TODO - G.M - 18-05-2018 - This code should not create trouble
+        # with thread and database, this should be verify.
+        # see https://github.com/tracim/tracim_backend/issues/62
+        tm = transaction.manager
+        dbsession = get_tm_session(self.session_factory, tm)
+        environ['tracim_tm'] = tm
+        environ['tracim_dbsession'] = dbsession
+        environ['tracim_cfg'] = self.app_config
+        app = self._application(environ, start_response)
+        dbsession.close()
+        return app
 
 
 class TracimUserSession(BaseMiddleware):
@@ -285,4 +289,4 @@ class TracimUserSession(BaseMiddleware):
             session=environ['tracim_dbsession'],
             config=environ['tracim_cfg'],
         ).get_one_by_email(environ['http_authenticator.username'])
-        return self._application(environ, start_response)
+        return self._application(environ, start_response)