vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed update sessions

Browse source
This commit is contained in:
Anand Doshi 2014-06-19 15:58:10 +05:30
parent cf8b6c0a6e
commit 412fab3e64
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/app.py
View file

@ -81,6 +81,12 @@ def application(request):
frappe.db.commit()
rollback = False
# update session
if getattr(frappe.local, "session_obj", None):
updated_in_db = frappe.local.session_obj.update()
if updated_in_db:
frappe.db.commit()
finally:
if frappe.local.request.method in ("POST", "PUT") and frappe.db and rollback:
frappe.db.rollback()

5
frappe/handler.py
View file

@ -87,11 +87,6 @@ def execute_cmd(cmd):
if ret:
frappe.response['message'] = ret
# update session
if "session_obj" in frappe.local:
frappe.local.session_obj.update()
def get_attr(cmd):
"""get method object from cmd"""
if '.' in cmd:

24
frappe/sessions.py
View file

@ -250,28 +250,32 @@ class Session:
def update(self, force=False):
"""extend session expiry"""
if (frappe.session['user'] == "Guest" or frappe.form_dict.cmd=="logout"):
return
now = frappe.utils.now()
self.data['data']['last_updated'] = now
self.data['data']['lang'] = unicode(frappe.lang)
# update session in db
time_diff = None
last_updated = frappe.cache().get_value("last_db_session_update:" + self.sid)
time_diff = frappe.utils.time_diff_in_seconds(now, last_updated) if last_updated else None
if last_updated:
time_diff = frappe.utils.time_diff_in_seconds(now, last_updated)
if force or (frappe.session['user'] != 'Guest' and \
((time_diff==None) or (time_diff > 600))):
# database persistence is secondary, don't update it too often
# database persistence is secondary, don't update it too often
updated_in_db = False
if force or (time_diff==None) or (time_diff > 600):
frappe.db.sql("""update tabSessions set sessiondata=%s,
lastupdate=NOW() where sid=%s""" , (str(self.data['data']),
self.data['sid']))
if frappe.form_dict.cmd not in ("frappe.sessions.clear", "logout"):
frappe.cache().set_value("last_db_session_update:" + self.sid, now)
frappe.cache().set_value("session:" + self.sid, self.data)
updated_in_db = True
# set in memcache
frappe.cache().set_value("last_db_session_update:" + self.sid, now)
frappe.cache().set_value("session:" + self.sid, self.data)
return updated_in_db
def get_expiry_period():
exp_sec = frappe.defaults.get_global_default("session_expiry") or "06:00:00"