Skip to content

Commit

Permalink
reverting rabbit monitor from bug 584485 (bug 589260)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Balogh committed Aug 23, 2010
1 parent b06ee6e commit 73dac3c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions apps/amo/templates/services/monitor.html
Expand Up @@ -98,9 +98,11 @@ <h2>[Zeus] Connection Tests (Hera)</h2>
</ul>
</div>

{#
<div class="notification-box {{ status(status_summary.rabbit) }}">
<h2>[RabbitMQ] celeryd connection</h2>
<p>Processed a task in {{ rabbit_results.duration|round(4) }} seconds.</p>
</div>
#}

{% endblock main_content %}
10 changes: 5 additions & 5 deletions apps/amo/views.py
Expand Up @@ -122,10 +122,10 @@ def monitor(request):
status_summary['hera'] = False

# Check Rabbit
start = time.time()
pong = celery.task.ping()
rabbit_results = r = {'duration': time.time() - start}
status_summary['rabbit'] = pong == 'pong' and r['duration'] < 1
# start = time.time()
# pong = celery.task.ping()
# rabbit_results = r = {'duration': time.time() - start}
# status_summary['rabbit'] = pong == 'pong' and r['duration'] < 1

# If anything broke, send HTTP 500
if not all(status_summary):
Expand All @@ -137,7 +137,7 @@ def monitor(request):
'filepath_results': filepath_results,
'redis_results': redis_results,
'hera_results': hera_results,
'rabbit_results': rabbit_results,
# 'rabbit_results': rabbit_results,
'status_summary': status_summary},
status=status)

Expand Down

0 comments on commit 73dac3c

Please sign in to comment.