diff --git a/rhodecode/lib/user_sessions.py b/rhodecode/lib/user_sessions.py --- a/rhodecode/lib/user_sessions.py +++ b/rhodecode/lib/user_sessions.py @@ -40,7 +40,7 @@ class BaseAuthSessions(object): def get_count(self): raise NotImplementedError - def get_expired_count(self): + def get_expired_count(self, older_than_seconds=None): raise NotImplementedError def clean_sessions(self, older_than_seconds=None): @@ -73,7 +73,7 @@ class FileAuthSessions(BaseAuthSessions) def get_count(self): return 'NOT AVAILABLE' - def get_expired_count(self): + def get_expired_count(self, older_than_seconds=None): return self.get_count() def clean_sessions(self, older_than_seconds=None): @@ -90,7 +90,7 @@ class MemcachedAuthSessions(BaseAuthSess def get_count(self): return 'NOT AVAILABLE' - def get_expired_count(self): + def get_expired_count(self, older_than_seconds=None): return self.get_count() def clean_sessions(self, older_than_seconds=None): @@ -103,7 +103,7 @@ class MemoryAuthSessions(BaseAuthSession def get_count(self): return 'NOT AVAILABLE' - def get_expired_count(self): + def get_expired_count(self, older_than_seconds=None): return self.get_count() def clean_sessions(self, older_than_seconds=None): diff --git a/rhodecode/templates/admin/settings/settings_sessions.mako b/rhodecode/templates/admin/settings/settings_sessions.mako --- a/rhodecode/templates/admin/settings/settings_sessions.mako +++ b/rhodecode/templates/admin/settings/settings_sessions.mako @@ -30,10 +30,22 @@
${h.secure_form(h.url('admin_settings_sessions_cleanup'), method='post')} -
- ${_('Cleanup all sessions that were not active during choosen time frame')}
- ${_('Picking All will log-out all users in the system, and each user will be required to log in again.')} -
+

+ ${_('Cleanup user sessions that were not active during chosen time frame.')}
+ ${_('After performing this action users whose session will be removed will be required to log in again.')}
+ ${_('Picking `All` will log-out you, and all users in the system.')} +

+ +