Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Schema Changes
- Added ScheduledJob
- Added GroupResolution.actor_id
- Added ``ScheduledJob`` model
- Added User.last_active

API Changes
~~~~~~~~~~~
Expand Down
1 change: 1 addition & 0 deletions src/sentry/conf/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ def env(key, default='', type=None):
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'sentry.middleware.auth.AuthenticationMiddleware',
'sentry.middleware.user.UserActiveMiddleware',
'sentry.middleware.sudo.SudoMiddleware',
'sentry.middleware.superuser.SuperuserMiddleware',
'sentry.middleware.locale.SentryLocaleMiddleware',
Expand Down
38 changes: 38 additions & 0 deletions src/sentry/middleware/user.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
from __future__ import absolute_import

import inspect
from datetime import timedelta
from django.utils import timezone


class UserActiveMiddleware(object):
disallowed_paths = (
'sentry.web.frontend.generic.static_media',
'sentry.web.frontend.user_avatar',
)

def process_view(self, request, view_func, view_args, view_kwargs):
view = view_func
if not inspect.isfunction(view_func):
view = view.__class__

try:
path = '%s.%s' % (view.__module__, view.__name__)
except AttributeError:
return

if path.startswith(self.disallowed_paths):
return

if not request.user.is_authenticated():
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could also do if hasattr(request, 'user') as I assume thats the issue you hit w/ the static paths

return

now = timezone.now()
freq = timedelta(minutes=5)
last_active = request.user.last_active

if last_active and freq > (now - last_active):
return

request.user.last_active = now
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use request.user.update(last_active=now) to avoid rewriting the entire row (which is what Django does with save())

request.user.update(last_active=now)
1 change: 1 addition & 0 deletions src/sentry/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class User(BaseModel, AbstractBaseUser):
session_nonce = models.CharField(max_length=12, null=True)

date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
last_active = models.DateTimeField(_('last active'), default=timezone.now, null=True)

objects = UserManager(cache_fields=['pk'])

Expand Down
Loading