Use a logger, remove unneeded config/scripts

mittab/apps/tab/forms.py

@@ -1,7 +1,7 @@
 from decimal import Decimal
 import os
 import itertools
-import pprint
+import logging
 
 from django.db import transaction
 from django import forms
@@ -12,6 +12,9 @@
 from mittab import settings
 
 
+logger = logging.getLogger('mittab')
+
+
 class UploadBackupForm(forms.Form):
     file = forms.FileField(label="Your Backup File")
 
@@ -458,7 +461,7 @@ def clean(self):
                     self._errors[key] = self.error_class([msg])
 
         except Exception as e:
-            print(("Caught error %s" % e))
+            logger.error("Error validating eballot form", exc_info=True)
             self._errors["winner"] = self.error_class(
                 ["Non handled error, preventing data contamination"])
 
@@ -565,9 +568,6 @@ def score_panel(result, discard_minority):
     ranked = [(deb, role, speak, rank + 1)
               for (rank, (deb, role, speak, _)) in enumerate(ranked)]
 
-    print("Ranked Debaters")
-    pprint.pprint(ranked)
-
     # Break any ties by taking the average of the tied ranks
     ties = {}
     for (score_i, score) in enumerate(ranked):
@@ -580,9 +580,6 @@ def score_panel(result, discard_minority):
         else:
             ties[tie_key] = [(score_i, score[3])]
 
-    print("Ties")
-    pprint.pprint(ties)
-
     # Average over the tied ranks
     for val in ties.values():
         if len(val) > 1:
@@ -592,8 +589,6 @@ def score_panel(result, discard_minority):
                 final_score = ranked[i]
                 ranked[i] = (final_score[0], final_score[1], final_score[2],
                              avg)
-    print("Final scores")
-    pprint.pprint(ranked)
 
     return ranked, final_winner
 

mittab/apps/tab/management/commands/export_stats.py

@@ -59,7 +59,6 @@ def handle(self, *args, **kwargs):
         if not os.path.exists(kwargs["root"]):
             os.makedirs(kwargs["root"])
 
-        print("Calculating ranks")
         teams = [
             self.make_team_row(team_score.team)
             for team_score in tab_logic.rankings.rank_teams()
@@ -84,7 +83,6 @@ def is_novice_team(team):
             if deb_score.debater.novice_status == Debater.NOVICE
         ]
 
-        print("Writing to csv")
         self.write_to_csv(os.path.join(kwargs["root"], kwargs["team_file"]),
                           self.TEAM_ROWS, teams)
         self.write_to_csv(
@@ -95,4 +93,3 @@ def is_novice_team(team):
         self.write_to_csv(
             os.path.join(kwargs["root"], kwargs["nov_debater_file"]),
             self.DEBATER_ROWS, nov_debaters)
-        print("Done!")

mittab/apps/tab/pairing_views.py

@@ -1,6 +1,7 @@
 import random
 import time
 import datetime
+import logging
 
 from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse
@@ -21,6 +22,9 @@
 import mittab.libs.backup as backup
 
 
+logger = logging.getLogger('mittab')
+
+
 @permission_required("tab.tab_settings.can_change", login_url="/403/")
 def pair_round(request):
     cache_logic.clear_cache()
@@ -120,7 +124,7 @@ def view_backup(request, filename):
 
 @permission_required("tab.tab_settings.can_change", login_url="/403/")
 def download_backup(request, key):
-    print("Trying to download {}".format(key))
+    logger.info(f"Trying to download {key}")
     data = backup.get_backup_content(key)
     response = HttpResponse(data, content_type="text/plain")
     response["Content-Disposition"] = "attachment; filename=%s" % key
@@ -409,11 +413,10 @@ def pretty_pair(request, printable=False):
     for present_team in Team.objects.filter(checked_in=True):
         if present_team not in paired_teams:
             if present_team not in byes:
-                print("got error for", present_team)
+                logger.error(f"got error for {present_team}")
                 errors.append(present_team)
 
     pairing_exists = TabSettings.get("pairing_released", 0) == 1
-    printable = printable
     return render(request, "pairing/pairing_display.html", locals())
 
 
@@ -591,7 +594,6 @@ def enter_multiple_results(request, round_id, num_entered):
             if all_good:
                 final_scores, final_winner = score_panel(
                     result, "discard_minority" in request.POST)
-                print(final_scores)
                 for (debater, role, speaks, ranks) in final_scores:
                     RoundStats.objects.create(debater=debater,
                                               round=round_obj,

mittab/settings.py

@@ -130,20 +130,40 @@
     }
 }
 
-if os.environ.get("MITTAB_LOG_QUERIES"):
-    LOGGING = {
-        "version": 1,
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",
-            },
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'verbose': {
+            'format': '{levelname} {asctime} {module} {process:d} {thread:d} {message}',
+            'style': '{',
         },
-        "loggers": {
-            "django.db.backends": {
-                "level": "DEBUG",
-            },
+        'simple': {
+            'format': '{levelname} {message}',
+            'style': '{',
         },
-        "root": {
-            "handlers": ["console"],
-        }
-    }
+    },
+    'handlers': {
+        'console': {
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose',
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': os.environ.get('DJANGO_LOG_LEVEL', 'INFO'),
+            'propagate': True,
+        },
+        'mittab': {
+            'handlers': ['console'],
+            'level': os.environ.get('MITTAB_LOG_LEVEL', 'INFO'),
+            'propagate': True,
+        },
+        'django.db.backends': {
+            'handlers': ['console'],
+            'level': 'INFO',
+            'propagate': False,
+        },
+    },
+}