From 7f7dc9476a37fe27f35c854d33f1305800f55c5d Mon Sep 17 00:00:00 2001
From: Neil Williams <neil@reddit.com>
Date: Thu, 16 Jun 2011 15:55:38 -0700
Subject: [PATCH] Remove the RequestLogMiddleware.

It doesn't play nicely with the new uWSGI setup and we don't use it.
---
 r2/example.ini             |  2 --
 r2/r2/config/middleware.py | 30 ------------------------------
 r2/r2/lib/app_globals.py   | 12 ------------
 r2/r2/lib/log.py           |  2 +-
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/r2/example.ini b/r2/example.ini
index 8db844978..55f3a4463 100755
--- a/r2/example.ini
+++ b/r2/example.ini
@@ -84,8 +84,6 @@ monitored_servers = reddit, localhost
 # name of the cookie to drop with login information
 login_cookie = reddit_session
 
-# set to a path to enable per-request logging
-log_path   = 
 # fraction of requests to pass into the queue-based usage sampler
 usage_sampling = 0.
 
diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py
index 2a5c6ab69..55f4a61a9 100644
--- a/r2/r2/config/middleware.py
+++ b/r2/r2/config/middleware.py
@@ -438,31 +438,6 @@ class RewriteMiddleware(object):
 
         return self.app(environ, start_response)
 
-class RequestLogMiddleware(object):
-    def __init__(self, log_path, process_iden, app):
-        self.log_path = log_path
-        self.app = app
-        self.process_iden = str(process_iden)
-
-    def __call__(self, environ, start_response):
-        request = '\n'.join('%s: %s' % (k,v) for k,v in environ.iteritems()
-                           if k.isupper())
-        iden = self.process_iden + '-' + sha.new(request).hexdigest()
-
-        fname = os.path.join(self.log_path, iden)
-        f = open(fname, 'w')
-        f.write(request)
-        f.close()
-
-        r = self.app(environ, start_response)
-
-        if os.path.exists(fname):
-            try:
-                os.remove(fname)
-            except OSError:
-                pass
-        return r
-
 class LimitUploadSize(object):
     """
     Middleware for restricting the size of uploaded files (such as
@@ -560,11 +535,6 @@ def make_app(global_conf, full_stack=True, **app_conf):
     app = ExtensionMiddleware(app)
     app = DomainMiddleware(app)
 
-    log_path = global_conf.get('log_path')
-    if log_path:
-        process_iden = global_conf.get('scgi_port', 'default')
-        app = RequestLogMiddleware(log_path, process_iden, app)
-
     #TODO: breaks on 404
     #app = make_gzip_middleware(app, app_conf)
 
diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
index 1eea5136e..a43a4e4f4 100755
--- a/r2/r2/lib/app_globals.py
+++ b/r2/r2/lib/app_globals.py
@@ -296,18 +296,6 @@ class Globals(object):
         else:
             self.static_names = {}
 
-        #set up the logging directory
-        log_path = self.log_path
-        process_iden = global_conf.get('scgi_port', 'default')
-        self.reddit_port = process_iden
-        if log_path:
-            if not os.path.exists(log_path):
-                os.makedirs(log_path)
-            for fname in os.listdir(log_path):
-                if fname.startswith(process_iden):
-                    full_name = os.path.join(log_path, fname)
-                    os.remove(full_name)
-
         #setup the logger
         self.log = logging.getLogger('reddit')
         self.log.addHandler(logging.StreamHandler())
diff --git a/r2/r2/lib/log.py b/r2/r2/lib/log.py
index af9d93151..46ee67574 100644
--- a/r2/r2/lib/log.py
+++ b/r2/r2/lib/log.py
@@ -33,7 +33,7 @@ Q = 'log_q'
 def _default_dict():
     return dict(time=datetime.now(tz),
                 host=g.reddit_host,
-                port=g.reddit_port,
+                port="default",
                 pid=g.reddit_pid)
 
 # e_value and e should actually be the same thing.