public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing unused db redis query counters.

Browse source
This commit is contained in:
Samuel Clay 2021-12-06 10:49:37 -05:00
parent 87c3b111a8
commit 779348c495
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/profile/middleware.py
View file

@ -146,10 +146,6 @@ class SQLLogToConsoleMiddleware:
for query in queries:
if query.get('mongo'):
query['sql'] = "~FM%s: %s" % (query['mongo']['collection'], query['mongo']['query'])
elif query.get('db_redis'):
query['sql'] = "~FC%s" % (query['db_redis']['query'])
elif query.get('redis'):
query['sql'] = "~FC%s" % (query['redis']['query'])
elif query.get('redis_user'):
query['sql'] = "~FC%s" % (query['redis_user']['query'])
elif query.get('redis_story'):
@ -179,10 +175,8 @@ class SQLLogToConsoleMiddleware:
not q.get('redis_user') and
not q.get('redis_story') and
not q.get('redis_session') and
not q.get('redis_pubsub') and
not q.get('db_redis')]),
not q.get('redis_pubsub')]),
'mongo': sum([float(q['time']) for q in queries if q.get('mongo')]),
'db_redis': sum([float(q['time']) for q in queries if q.get('db_redis')]),
'redis_user': sum([float(q['time']) for q in queries if q.get('redis_user')]),
'redis_story': sum([float(q['time']) for q in queries if q.get('redis_story')]),
'redis_session': sum([float(q['time']) for q in queries if q.get('redis_session')]),

7
terraform/digitalocean.tf
View file

@ -514,16 +514,17 @@ resource "digitalocean_droplet" "db-metrics" {
}
}
# apd -l "task-celery4*" --tags stop; servers=$(for i in {39..48}; do echo -n "-target=\"digitalocean_droplet.task-celery[$i]\" " ; done); tf apply -refresh=false `eval echo $servers`
resource "digitalocean_droplet" "task-celery" {
count = 79
image = var.droplet_os
name = format("task-celery%02v", count.index+1)
region = var.droplet_region
size = var.droplet_size
size = var.droplet_size_10
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
provisioner "local-exec" {
command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120"
# command = "sleep 120"
# command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120"
command = "sleep 120"
}
provisioner "local-exec" {
command = "cd ..; ansible-playbook -l ${self.name} ansible/playbooks/setup_root.yml"

26
utils/request_introspection_middleware.py
View file

@ -21,22 +21,16 @@ class DumpRequestMiddleware:
def process_response(self, request, response):
if hasattr(request, 'sql_times_elapsed'):
if request.sql_times_elapsed.get('redis_user'):
redis_log = "~FCuser:%s%.6f~SNs ~FCstory:%s%.6f~SNs ~FCsession:%s%.6f~SNs ~FCpubsub:%s%.6f~SNs" % (
self.color_db(request.sql_times_elapsed['redis_user'], '~FC'),
request.sql_times_elapsed['redis_user'],
self.color_db(request.sql_times_elapsed['redis_story'], '~FC'),
request.sql_times_elapsed['redis_story'],
self.color_db(request.sql_times_elapsed['redis_session'], '~FC'),
request.sql_times_elapsed['redis_session'],
self.color_db(request.sql_times_elapsed['redis_pubsub'], '~FC'),
request.sql_times_elapsed['redis_pubsub'],
)
else:
redis_log = "%s%.6f~SNs" % (
self.color_db(request.sql_times_elapsed['db_redis'], '~FC'),
request.sql_times_elapsed['db_redis'],
)
redis_log = "~FCuser:%s%.6f~SNs ~FCstory:%s%.6f~SNs ~FCsession:%s%.6f~SNs ~FCpubsub:%s%.6f~SNs" % (
self.color_db(request.sql_times_elapsed['redis_user'], '~FC'),
request.sql_times_elapsed['redis_user'],
self.color_db(request.sql_times_elapsed['redis_story'], '~FC'),
request.sql_times_elapsed['redis_story'],
self.color_db(request.sql_times_elapsed['redis_session'], '~FC'),
request.sql_times_elapsed['redis_session'],
self.color_db(request.sql_times_elapsed['redis_pubsub'], '~FC'),
request.sql_times_elapsed['redis_pubsub'],
)
logging.debug(" ---> %s~SN~FCDB times: ~FYsql: %s%.4f~SNs ~SN~FMmongo: %s%.5f~SNs ~SN~FCredis: %s" % (
self.elapsed_time(request),
self.color_db(request.sql_times_elapsed['sql'], '~FY'),