paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add user_activity_test worker that does nothing."

Browse Source 
Now that we've debugged the memory leak, I don't think we need this
anymore.

This reverts commit 1bdc7ee2f72bdebb1cdc94601247834a434614d6.

Conflicts:

	puppet/zulip/files/cron.d/rabbitmq-numconsumers
	puppet/zulip/files/supervisor/conf.d/zulip.conf

(imported from commit ff87f2aebcbc71013fa7a05aedb24e2dcad82ae6)
This commit is contained in:
Tim Abbott
2013-12-03 16:13:59 -05:00
parent 606d8a4f9b
commit f7ac58bab5
4 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/zulip/files/cron.d/rabbitmq-numconsumers
View File

@@ -12,5 +12,4 @@ USER=root
* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file feedback_messages
* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file error_reports
* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file digest_emails
* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file user_activity_test
* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file missedmessage_mobile_notifications

14
puppet/zulip/files/supervisor/conf.d/zulip.conf
View File

@@ -78,18 +78,6 @@ redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-user-activity-interval.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/
[program:zulip-events-user-activity-test]
command=python /home/zulip/deployments/current/manage.py process_queue user_activity_test
priority=300 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected)
stopsignal=TERM ; signal used to kill process (default TERM)
stopwaitsecs=30 ; max num secs to wait b4 SIGKILL (default 10)
user=zulip ; setuid to this UNIX account to run the program
redirect_stderr=true ; redirect proc stderr to stdout (default false)
stdout_logfile=/var/log/zulip/events-user-activity-test.log ; stdout log path, NONE for none; default AUTO
directory=/home/zulip/deployments/current/
[program:zulip-events-user-presence]
command=python /home/zulip/deployments/current/manage.py process_queue user_presence
priority=300 ; the relative start priority (default 999)
@@ -231,7 +219,7 @@ directory=/home/zulip/deployments/current/
[group:zulip-workers]
; each refers to 'x' in [program:x] definitions
programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-events-user-presence,zulip-events-signups,zulip-events-confirmation-emails,zulip-events-missedmessage_reminders,zulip-events-slowqueries,zulip-events-message_sender,zulip-events-feedback_messages,zulip-events-digest_emails,zulip-events-error_reports,zulip-deliver-enqueued-emails,zulip-events-user-activity-test,zulip-events-missedmessage_mobile_notifications
programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-events-user-presence,zulip-events-signups,zulip-events-confirmation-emails,zulip-events-missedmessage_reminders,zulip-events-slowqueries,zulip-events-message_sender,zulip-events-feedback_messages,zulip-events-digest_emails,zulip-events-error_reports,zulip-deliver-enqueued-emails,zulip-events-missedmessage_mobile_notifications
; The [include] section can just contain the "files" setting. This
; setting can list multiple files (separated by whitespace or

1
zerver/decorator.py
View File

@@ -68,7 +68,6 @@ def update_user_activity(request, user_profile):
'time': datetime_to_timestamp(now()),
'client': request.client.name}
queue_json_publish("user_activity", event, lambda event: None)
queue_json_publish("user_activity_test", event, lambda event: None)
# Based on django.views.decorators.http.require_http_methods
def require_post(func):

5
zerver/worker/queue_processors.py
View File

@@ -138,11 +138,6 @@ class UserActivityWorker(QueueProcessingWorker):
query = event["query"]
do_update_user_activity(user_profile, client, query, log_time)
@assign_queue('user_activity_test')
class UserActivityTestWorker(QueueProcessingWorker):
def consume(self, event):
pass
@assign_queue('user_activity_interval')
class UserActivityIntervalWorker(QueueProcessingWorker):
def consume(self, event):