summaryrefslogtreecommitdiff
path: root/addons/web/common/http.py
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
committerVo Minh Thu <vmt@openerp.com>2012-01-16 12:06:31 +0100
commit3203d264aecd751a8c261cea4f72fa323a3098be (patch)
tree93cdf7c89795b809963ef08a68d84d293cf41a7a /addons/web/common/http.py
parent1497062ba1dbfd814c69fa4250c4eb6a09a5206a (diff)
parent064a50bcde5f1c65a17f4feb42348b5809081085 (diff)
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120116110631-lrzp6uxsjki7by22
Diffstat (limited to 'addons/web/common/http.py')
-rw-r--r--addons/web/common/http.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index f3ac8d0bcd9..17ccfb63d8a 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -10,6 +10,7 @@ import os
import pprint
import sys
import threading
+import time
import traceback
import urllib
import uuid
@@ -331,8 +332,9 @@ def session_context(request, storage_path, session_cookie='sessionid'):
if (isinstance(value, session.OpenERPSession)
and not value._uid
and not value.jsonp_requests
+ and value._creation_time + (60*5) < time.time() # FIXME do not use a fixed value
):
- _logger.info('remove session %s: %r', key, value.jsonp_requests)
+ _logger.debug('remove session %s', key)
del request.session[key]
with session_lock: