Merge pull request #201 from anmekin/feature/remove_httplog

Remove HttpLog

5 files changed, 33 insertions, 23 deletions

diff --git a/omaha_server/omaha/migrations/0027_auto_20160713_0755.py b/omaha_server/omaha/migrations/0027_auto_20160713_0755.py
new file mode 100644
index 0000000..9cd07ca
--- /dev/null
+++ b/omaha_server/omaha/migrations/0027_auto_20160713_0755.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-07-07 07:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('omaha', '0026_grant_permission_django_site'),
+    ]
+
+    operations = [
+        migrations.RunSQL('DROP TABLE IF EXISTS httplog_entry;', reverse_sql=migrations.RunSQL.noop),
+    ]
+
diff --git a/omaha_server/omaha/migrations/0029_merge.py b/omaha_server/omaha/migrations/0029_merge.py
new file mode 100644
index 0000000..27e815a
--- /dev/null
+++ b/omaha_server/omaha/migrations/0029_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-08-09 09:14
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('omaha', '0027_auto_20160713_0755'),
+        ('omaha', '0028_auto_20160707_0825'),
+    ]
+
+    operations = [
+    ]
diff --git a/omaha_server/omaha_server/settings_dev.py b/omaha_server/omaha_server/settings_dev.py
index c7df3de..99f652c 100644
--- a/omaha_server/omaha_server/settings_dev.py
+++ b/omaha_server/omaha_server/settings_dev.py
@@ -2,18 +2,3 @@
 
 from .settings_prod import *
 
-
-INSTALLED_APPS += (
-    'httplog',
-)
-
-MIDDLEWARE_CLASSES += (
-    'httplog.middleware.RequestResponseLoggingMiddleware',
-)
-
-HTTPLOG_URLNAMES = ['update', 'sparkle_appcast', 'crash']
-HTTPLOG_APPS = ['omaha', 'crash', 'sparkle']
-
-SUIT_CONFIG['MENU'] = SUIT_CONFIG['MENU'] + (
-    {'app': 'httplog', 'label': 'httplog', 'icon': 'icon-search'},
-)
diff --git a/omaha_server/omaha_server/settings_local.py b/omaha_server/omaha_server/settings_local.py
index c65c9c6..9993558 100644
--- a/omaha_server/omaha_server/settings_local.py
+++ b/omaha_server/omaha_server/settings_local.py
@@ -16,16 +16,12 @@ SITE_ID = 1
 INSTALLED_APPS += (
     'debug_toolbar',
     'debug_panel',
-    'httplog',
 )
 
 MIDDLEWARE_CLASSES += (
     'debug_panel.middleware.DebugPanelMiddleware',
-    'httplog.middleware.RequestResponseLoggingMiddleware',
 )
 
-HTTPLOG_URLNAMES = ['update', 'sparkle_appcast']
-
 #
 # Debug Toolbar
 #
diff --git a/requirements/base.txt b/requirements/base.txt
index 795a939..3f02a54 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -32,7 +32,3 @@ protobuf==3.0.0a3
 protobuf-to-dict==0.1.0
 django-dynamic-preferences==0.8.1
 ecdsa==0.13
-
-# Only dev
-#django-httplog==0.2.3
-https://github.com/Crystalnix/django-httplog/archive/6ed2a8a4e3d606443492998cbac93a71f4cee7d1.zip