[Cluster-devel] conga ./conga.spec.in.in luci/plone-custom/man ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-03-24 23:18:53

Modified files:
	.              : conga.spec.in.in 
	luci/plone-custom: manage_inactive.js 
	luci/site/luci/Extensions: LuciZope.py LuciZopeAsync.py 
	luci/site/luci/var: Data.fs 

Log message:
	- Fix bz437398 (When Luci session times out a re-login is thought to be a logout.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.74&r2=1.45.2.75
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/manage_inactive.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZope.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.7&r2=1.1.4.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZopeAsync.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.6&r2=1.1.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.30&r2=1.15.2.31

--- conga/conga.spec.in.in	2008/03/19 20:10:47	1.45.2.74
+++ conga/conga.spec.in.in	2008/03/24 23:18:22	1.45.2.75
@@ -294,6 +294,7 @@
 * Wed Feb 27 2008 Ryan McCabe <rmccabe at redhat.com> 0.12.0-6
 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly)
 - Fix bz304931 (Rich Sybase resource agent configuration support)
+- Fix bz437398 (When Luci session times out a re-login is thought to be a logout.)
 
 * Tue Feb 12 2008 Ryan McCabe <rmccabe at redhat.com> 0.12.0-5
 - Fix bz432533 (Do not attempt to install the cmirror package when shared storage is requested)
--- conga/luci/plone-custom/manage_inactive.js	2008/02/08 21:56:33	1.1.2.1
+++ conga/luci/plone-custom/manage_inactive.js	2008/03/24 23:18:23	1.1.2.2
@@ -78,7 +78,7 @@
 	return (initiate_async_get(check_inactive_url, check_inactive_callback));
 }
 
-setInterval("update_last_active()", 1000 * 30);
+setInterval("update_last_active()", 100 * 275);
 setInterval("check_user_inactive()", 1000 * 60);
 window.onmousemove = new Function('activity_event_handler()');
 window.onkeypress = new Function('activity_event_handler()');
--- conga/luci/site/luci/Extensions/LuciZope.py	2008/03/12 15:13:12	1.1.4.7
+++ conga/luci/site/luci/Extensions/LuciZope.py	2008/03/24 23:18:23	1.1.4.8
@@ -8,7 +8,7 @@
 from LuciZopePerm import userAuthenticated
 from LuciDB import allowed_systems
 from LuciSyslog import get_logger
-from conga_constants import LUCI_DEBUG_MODE
+from conga_constants import LUCI_DEBUG_MODE, INACTIVITY_TIMEOUT_SEC
 
 luci_log = get_logger()
 
@@ -184,10 +184,10 @@
 	from time import time
 	if userAuthenticated(self):
 		request.SESSION.set('last_activity', int(time()))
+		request.SESSION.setTimeoutMinutes(max(INACTIVITY_TIMEOUT_SEC / 60, 10))
 
 def user_check_inactive(self, request):
 	from time import time
-	from conga_constants import INACTIVITY_TIMEOUT_SEC as INACTIVITY_TIMEOUT
 
 	if not userAuthenticated(self):
 		return (False, -1)
@@ -196,11 +196,12 @@
 	old_time = request.SESSION.get('last_activity', None)
 	if old_time is None:
 		request.SESSION.set('last_activity', cur_time)
+		request.SESSION.setTimeoutMinutes(max(INACTIVITY_TIMEOUT_SEC / 60, 10))
 		return (False, -2)
 	old_time = int(old_time)
 
 	time_diff = cur_time - old_time
-	if time_diff >= INACTIVITY_TIMEOUT:
+	if time_diff >= INACTIVITY_TIMEOUT_SEC:
 		return (True, time_diff)
 	return (False, time_diff)
 
--- conga/luci/site/luci/Extensions/LuciZopeAsync.py	2008/02/27 20:22:19	1.1.2.6
+++ conga/luci/site/luci/Extensions/LuciZopeAsync.py	2008/03/24 23:18:23	1.1.2.7
@@ -172,8 +172,9 @@
 
 def check_inactive_async(self, request):
 	from LuciZope import user_check_inactive
+	from conga_constants import INACTIVITY_TIMEOUT_SEC
 	(inactive, diff) = user_check_inactive(self, request)
-	xml_obj = result_to_xml((True, { 'inactive': inactive, 'diff': diff }))
+	xml_obj = result_to_xml((True, { 'inactive': inactive, 'diff': diff, 'max_inactive': INACTIVITY_TIMEOUT_SEC }))
 	write_xml_resp(request, xml_obj)
 
 def update_inactive_async(self, request):
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/02/27 20:22:19	1.15.2.30 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2008/03/24 23:18:23	1.15.2.31 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed