user-sessions: fix other backend expired count, and fixed some helper text.

rhodecode/lib/user_sessions.py

@@ -1,125 +1,125 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2017-2017 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import datetime
 import dateutil
 from rhodecode.model.db import DbSession, Session
 
 
 class CleanupCommand(Exception):
     pass
 
 
 class BaseAuthSessions(object):
     SESSION_TYPE = None
 
     def __init__(self, config):
         session_conf = {}
         for k, v in config.items():
             if k.startswith('beaker.session'):
                 session_conf[k] = v
         self.config = session_conf
 
     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):
         raise NotImplementedError
 
     def _seconds_to_date(self, seconds):
         return datetime.datetime.utcnow() - dateutil.relativedelta.relativedelta(
             seconds=seconds)
 
 
 class DbAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'ext:database'
 
     def get_count(self):
         return DbSession.query().count()
 
     def get_expired_count(self, older_than_seconds=None):
         expiry_date = self._seconds_to_date(older_than_seconds)
         return DbSession.query().filter(DbSession.accessed < expiry_date).count()
 
     def clean_sessions(self, older_than_seconds=None):
         expiry_date = self._seconds_to_date(older_than_seconds)
         DbSession.query().filter(DbSession.accessed < expiry_date).delete()
         Session().commit()
 
 
 class FileAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'file sessions'
 
     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):
         data_dir = self.config.get('beaker.session.data_dir')
         raise CleanupCommand(
             'Please execute this command: '
             '`find . -mtime +60 -exec rm {{}} \;` inside {} directory'.format(
                 data_dir))
 
 
 class MemcachedAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'ext:memcached'
 
     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):
         raise CleanupCommand('Cleanup for this session type not yet available')
 
 
 class MemoryAuthSessions(BaseAuthSessions):
     SESSION_TYPE = 'memory'
 
     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):
         raise CleanupCommand('Cleanup for this session type not yet available')
 
 
 def get_session_handler(session_type):
     types = {
         'file': FileAuthSessions,
         'ext:memcached': MemcachedAuthSessions,
         'ext:database': DbAuthSessions,
         'memory': MemoryAuthSessions
     }
 
     try:
         return types[session_type]
     except KeyError:
         raise ValueError(
             'This type {} is not supported'.format(session_type))

rhodecode/templates/admin/settings/settings_sessions.mako

@@ -1,60 +1,62 b''
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('User Sessions Configuration')}</h3>
     </div>
     <div class="panel-body">
         <%
          elems = [
             (_('Session type'), c.session_model.SESSION_TYPE, ''),
             (_('Session expiration period'), '{} seconds'.format(c.session_conf.get('beaker.session.timeout', 0)), ''),
 
             (_('Total sessions'), c.session_count, ''),
             (_('Expired sessions ({} days)').format(c.cleanup_older_days ), c.session_expired_count, ''),
 
         ]
         %>
         <dl class="dl-horizontal settings">
         %for dt, dd, tt in elems:
           <dt>${dt}:</dt>
           <dd title="${tt}">${dd}</dd>
         %endfor
         </dl>
     </div>
 </div>
 
 
 <div class="panel panel-warning">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Cleanup Old Sessions')}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.url('admin_settings_sessions_cleanup'), method='post')}
 
-            <div style="margin: 0 0 20px 0" class="fake-space">
-            ${_('Cleanup all sessions that were not active during choosen time frame')} <br/>
-            ${_('Picking All will log-out all users in the system, and each user will be required to log in again.')}
-            </div>
+            <p>
+            ${_('Cleanup user sessions that were not active during chosen time frame.')} <br/>
+            ${_('After performing this action users whose session will be removed will be required to log in again.')} <br/>
+            <strong>${_('Picking `All` will log-out you, and all users in the system.')}</strong>
+           </p>
+
+            <script type="text/javascript">
+              $(document).ready(function() {
+                  $('#expire_days').select2({
+                      containerCssClass: 'drop-menu',
+                      dropdownCssClass: 'drop-menu-dropdown',
+                      dropdownAutoWidth: true,
+                      minimumResultsForSearch: -1
+                  });
+              });
+            </script>
             <select id="expire_days" name="expire_days">
                 % for n in [60, 90, 30, 7, 0]:
                     <option value="${n}">${'{} days'.format(n) if n != 0 else 'All'}</option>
                 % endfor
             </select>
             <button class="btn btn-small" type="submit"
                 onclick="return confirm('${_('Confirm to cleanup user sessions')}');">
                 ${_('Cleanup sessions')}
             </button>
         ${h.end_form()}
     </div>
 </div>
 
 
-<script type="text/javascript">
-  $(document).ready(function() {
-      $('#expire_days').select2({
-          containerCssClass: 'drop-menu',
-          dropdownCssClass: 'drop-menu-dropdown',
-          dropdownAutoWidth: true,
-          minimumResultsForSearch: -1
-      });
-  });
-</script>
  No newline at end of file