From 8aac380af5fcf788dcdcb99761c9f36ca3f85b7f Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 26 Jun 2020 14:48:41 -0400
Subject: [PATCH 1/2] Removing migrations that set a default date of
 2020-05-08. Not sure why this was committed. I thought we resolved the issue
 with default datetimes?

---
 .../migrations/0002_auto_20200607_0310.py     | 25 ---------------
 .../migrations/0003_auto_20200608_0407.py     | 31 -------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 apps/reader/migrations/0002_auto_20200607_0310.py
 delete mode 100644 apps/reader/migrations/0003_auto_20200608_0407.py

diff --git a/apps/reader/migrations/0002_auto_20200607_0310.py b/apps/reader/migrations/0002_auto_20200607_0310.py
deleted file mode 100644
index 4fdbd0c55..000000000
--- a/apps/reader/migrations/0002_auto_20200607_0310.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import datetime
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('reader', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usersubscription',
-            name='last_read_date',
-            field=models.DateTimeField(default=datetime.datetime(2020, 5, 8, 3, 10, 23, 333888)),
-        ),
-        migrations.AlterField(
-            model_name='usersubscription',
-            name='mark_read_date',
-            field=models.DateTimeField(default=datetime.datetime(2020, 5, 8, 3, 10, 23, 333888)),
-        ),
-    ]
diff --git a/apps/reader/migrations/0003_auto_20200608_0407.py b/apps/reader/migrations/0003_auto_20200608_0407.py
deleted file mode 100644
index 483f63a68..000000000
--- a/apps/reader/migrations/0003_auto_20200608_0407.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import datetime
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('reader', '0002_auto_20200607_0310'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='usersubscription',
-            name='last_read_date',
-            field=models.DateTimeField(default=datetime.datetime(2020, 5, 9, 4, 7, 2, 250571)),
-        ),
-        migrations.AlterField(
-            model_name='usersubscription',
-            name='mark_read_date',
-            field=models.DateTimeField(default=datetime.datetime(2020, 5, 9, 4, 7, 2, 250571)),
-        ),
-        migrations.AlterField(
-            model_name='usersubscriptionfolders',
-            name='user',
-            field=models.OneToOneField(to=settings.AUTH_USER_MODEL),
-        ),
-    ]

From c475fd2edcbd24a1f8ca44ea2bf0215edbbcbfb3 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 26 Jun 2020 15:56:06 -0400
Subject: [PATCH 2/2] Fixing missing DB logs (redis and mongo) due to this
 change in django 1.8: "connections.queries is now a read-only attribute."

---
 apps/profile/middleware.py        | 2 ++
 utils/mongo_raw_log_middleware.py | 4 +++-
 utils/redis_raw_log_middleware.py | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/profile/middleware.py b/apps/profile/middleware.py
index a0f3766bb..39008be85 100644
--- a/apps/profile/middleware.py
+++ b/apps/profile/middleware.py
@@ -106,6 +106,8 @@ class SQLLogToConsoleMiddleware:
         if connection.queries:
             time_elapsed = sum([float(q['time']) for q in connection.queries])
             queries = connection.queries
+            if getattr(connection, 'queriesx', False):
+                queries.extend(connection.queriesx)
             for query in queries:
                 if query.get('mongo'):
                     query['sql'] = "~FM%s: %s" % (query['mongo']['collection'], query['mongo']['query'])
diff --git a/utils/mongo_raw_log_middleware.py b/utils/mongo_raw_log_middleware.py
index 7c998cb3f..fdc37692a 100644
--- a/utils/mongo_raw_log_middleware.py
+++ b/utils/mongo_raw_log_middleware.py
@@ -63,7 +63,9 @@ class MongoDumpMiddleware(object):
             result = original_method(*args, **kwargs)
             stop = time()
             duration = stop - start
-            connection.queries.append({
+            if not getattr(connection, 'queriesx', False):
+                connection.queriesx = []
+            connection.queriesx.append({
                 'mongo': message,
                 'time': '%.3f' % duration,
             })
diff --git a/utils/redis_raw_log_middleware.py b/utils/redis_raw_log_middleware.py
index a7d4e159d..7854a5c27 100644
--- a/utils/redis_raw_log_middleware.py
+++ b/utils/redis_raw_log_middleware.py
@@ -39,7 +39,9 @@ class RedisDumpMiddleware(object):
             result = original_method(*args, **kwargs)
             stop = time()
             duration = stop - start
-            connection.queries.append({
+            if not getattr(connection, 'queriesx', False):
+                connection.queriesx = []
+            connection.queriesx.append({
                 'redis': message,
                 'time': '%.3f' % duration,
             })