From cf210ea171bcd533478d4481a08d796b38fa3eb5 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Thu, 26 Jan 2012 15:03:19 -0500 Subject: [PATCH] switch tracking to use logger --- track/middleware.py | 6 +++++- track/views.py | 42 ++++++------------------------------------ 2 files changed, 11 insertions(+), 37 deletions(-) diff --git a/track/middleware.py b/track/middleware.py index 866accbeb5..407f64b992 100644 --- a/track/middleware.py +++ b/track/middleware.py @@ -1,4 +1,8 @@ -import views, json +import json + +from django.conf import settings + +import views class TrackMiddleware: def process_request (self, request): diff --git a/track/views.py b/track/views.py index 2a368b3188..a95cc1ca62 100644 --- a/track/views.py +++ b/track/views.py @@ -1,47 +1,17 @@ +import json +import logging +import os + # Create your views here. from django.http import HttpResponse from django.http import Http404 from django.conf import settings -import json, os, stat -import tempfile - -if settings.TRACK_DIR != None: - directory = tempfile.mkdtemp(prefix = settings.TRACK_DIR) -else: - directory = None - -logfile = None -file_index = 0 -log_index = 0 -filename = None - -def make_file(): - global logfile, log_index, file_index, filename - if logfile != None: - logfile.close() - os.chmod(filename, stat.S_IRUSR | stat.S_IWUSR | \ - stat.S_IRGRP | stat.S_IWGRP | \ - stat.S_IROTH ) - filename = directory+"/%05i"%(file_index)+".trklog" - logfile = open(filename, "w") - file_index = file_index + 1 - log_index = 0 +log = logging.getLogger("tracking") def log_event(event): - global logfile, log_index event_str = json.dumps(event) - if settings.TRACK_DIR == None: -# print event - return - - if logfile == None or log_index >= settings.MAXLOG: - make_file() - - logfile.write(event_str[:settings.TRACK_MAX_EVENT]+'\n') - if settings.DEBUG_TRACK_LOG: - print event_str - log_index = log_index + 1 + log.info(event_str[:settings.TRACK_MAX_EVENT]) def user_track(request): try: # TODO: Do the same for many of the optional META parameters