Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved activity stream duplicate/delay check.

Browse source
This commit is contained in:
Martin Edenhofer 2016-04-13 09:30:44 +02:00
parent bb1907415b
commit 79bfd021f9
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/activity_stream.rb
View file

@ -49,7 +49,14 @@ add a new activity entry for an object
).order('created_at DESC, id DESC').first
# resturn if old entry is really fresh
return result if result && result.created_at.to_i >= ( data[:created_at].to_i - 20 )
if result
activity_record_delay = if ENV['ZAMMAD_ACTIVITY_RECORD_DELAY']
ENV['ZAMMAD_ACTIVITY_RECORD_DELAY'].to_i.seconds
else
90.seconds
end
return result if result.created_at.to_i >= ( data[:created_at].to_i - activity_record_delay )
end
# create history
record = {

12
test/unit/activity_stream_test.rb
View file

@ -18,6 +18,12 @@ class ActivityStreamTest < ActiveSupport::TestCase
)
current_user = User.lookup(email: 'nicole.braun@zammad.org')
activity_record_delay = if ENV['ZAMMAD_ACTIVITY_RECORD_DELAY']
ENV['ZAMMAD_ACTIVITY_RECORD_DELAY'].to_i.seconds
else
90.seconds
end
test 'ticket+user' do
tests = [
@ -118,7 +124,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
article.update_attributes(test[:update][:article])
end
sleep 21
sleep activity_record_delay + 1
if test[:update][:ticket]
ticket.update_attributes(test[:update][:ticket])
end
@ -194,7 +200,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
test[:check][1][:o_id] = organization.id
test[:check][1][:updated_at] = organization.updated_at
test[:check][1][:created_by_id] = current_user.id
sleep 19
sleep activity_record_delay - 1
end
if test[:update2][:organization]
@ -340,7 +346,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
end
# to verify update which need to be logged
sleep 21
sleep activity_record_delay + 1
if test[:update2][:user]
user.update_attributes(test[:update2][:user])