Merge lp:~mwhudson/launchpad/no-hosted-area-join-launchpad-loggerhead into lp:launchpad/db-devel

[Michael Hudson-Doyle]

Hi Tim,

This branch makes the launchpad-loggerhead code part of the launchpad tree, something I've been meaning to do for ages. No other changes.

Cheers,
mwh

[Tim Penhey (thumper)]

scripts/start-loggerhead.py
 - Still says
#!/usr/bin/env python2.4
  instead of
#!/usr/bin/env python2.5

same for stop-loggerhead.py

Where is the content of the launchpad-loggerhead directory of the
sourcecode branch that has been removed? Did you forget to add it
in?

review: Needs Information

Unmerged revisions

9727. By Michael Hudson-Doyle on 2010-04-26

move the rest of the launchpad-loggerhead glue into the tree

9726. By Michael Hudson-Doyle on 2010-04-26

move launchpad_loggerhead code into lib

9725. By Michael Hudson-Doyle on 2010-04-26

join launchpad-loggerhead into the launchpad tree

=== modified file 'Makefile'
--- Makefile	2010-04-22 12:03:33 +0000
+++ Makefile	2010-04-27 02:02:42 +0000
@@ -229,13 +229,13 @@
 	    -i $(LPCONFIG)
 
 run_codebrowse: build
-	BZR_PLUGIN_PATH=bzrplugins $(PY) sourcecode/launchpad-loggerhead/start-loggerhead.py -f
+	BZR_PLUGIN_PATH=bzrplugins $(PY) scripts/start-loggerhead.py -f
 
 start_codebrowse: build
-	BZR_PLUGIN_PATH=$(shell pwd)/bzrplugins $(PY) sourcecode/launchpad-loggerhead/start-loggerhead.py
+	BZR_PLUGIN_PATH=$(shell pwd)/bzrplugins $(PY) scripts/start-loggerhead.py
 
 stop_codebrowse:
-	$(PY) sourcecode/launchpad-loggerhead/stop-loggerhead.py
+	$(PY) scripts/stop-loggerhead.py
 
 run_codehosting: check_schema inplace stop hosted_branches
 	$(RM) thread*.request
 
=== removed directory 'lib/canonical/launchpad/apidoc'
=== removed symlink 'lib/launchpad_loggerhead'
=== target was u'../sourcecode/launchpad-loggerhead/launchpad_loggerhead/'
=== added file 'scripts/start-loggerhead.py'
--- scripts/start-loggerhead.py	1970-01-01 00:00:00 +0000
+++ scripts/start-loggerhead.py	2010-04-27 02:02:42 +0000
@@ -0,0 +1,175 @@
+#!/usr/bin/env python2.4
+#
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+import logging
+import os
+import sys
+
+from paste import httpserver
+from paste.deploy.config import PrefixMiddleware
+from paste.httpexceptions import HTTPExceptionHandler
+from paste.request import construct_url
+from paste.translogger import TransLogger
+
+from canonical.config import config
+import lp.codehosting
+
+LISTEN_HOST = '0.0.0.0'
+LISTEN_PORT = 8080
+THREADPOOL_WORKERS = 10
+
+
+class NoLockingFileHandler(logging.FileHandler):
+    """A version of logging.FileHandler that doesn't do it's own locking.
+
+    We experienced occasional hangs in production where gdb-ery on the server
+    revealed that we sometimes end up with many threads blocking on the RLock
+    held by the logging file handler, and log reading finds that an exception
+    managed to kill a thread in an unsafe window for RLock's.
+
+    Luckily, there's no real reason for us to take a lock during logging as
+    each log message translates to one call to .write on a file object, which
+    translates to one fwrite call, and it seems that this does enough locking
+    itself for our purposes.
+
+    So this handler just doesn't lock in log message handling.
+    """
+
+    def acquire(self):
+        pass
+
+    def release(self):
+        pass
+
+
+def setup_logging(home, foreground):
+    # i hate that stupid logging config format, so just set up logging here.
+
+    log_folder = config.codebrowse.log_folder
+    if not log_folder:
+        log_folder = os.path.join(home, 'logs')
+    if not os.path.exists(log_folder):
+        os.mkdir(log_folder)
+
+    f = logging.Formatter(
+        '%(levelname)-.3s [%(asctime)s.%(msecs)03d] [%(thread)d] %(name)s: %(message)s',
+        '%Y%m%d-%H:%M:%S')
+    debug_log = NoLockingFileHandler(os.path.join(log_folder, 'debug.log'))
+    debug_log.setLevel(logging.DEBUG)
+    debug_log.setFormatter(f)
+    if foreground:
+        stdout_log = logging.StreamHandler(sys.stdout)
+        stdout_log.setLevel(logging.DEBUG)
+        stdout_log.setFormatter(f)
+    f = logging.Formatter('[%(asctime)s.%(msecs)03d] %(message)s',
+                          '%Y%m%d-%H:%M:%S')
+    access_log = NoLockingFileHandler(os.path.join(log_folder, 'access.log'))
+    access_log.setLevel(logging.INFO)
+    access_log.setFormatter(f)
+
+    logging.getLogger('').setLevel(logging.DEBUG)
+    logging.getLogger('').addHandler(debug_log)
+    logging.getLogger('wsgi').addHandler(access_log)
+
+    if foreground:
+        logging.getLogger('').addHandler(stdout_log)
+    else:
+        class S(object):
+            def write(self, str):
+                logging.getLogger().error(str.rstrip('\n'))
+            def flush(self):
+                pass
+        sys.stderr = S()
+
+
+
+foreground = False
+if len(sys.argv) > 1:
+    if sys.argv[1] == '-f':
+        foreground = True
+
+home = os.path.realpath(os.path.dirname(__file__))
+pidfile = os.path.join(home, 'loggerhead.pid')
+
+if not foreground:
+    sys.stderr.write('\n')
+    sys.stderr.write('Launching loggerhead into the background.\n')
+    sys.stderr.write('PID file: %s\n' % (pidfile,))
+    sys.stderr.write('\n')
+
+    from loggerhead.daemon import daemonize
+    daemonize(pidfile, home)
+
+setup_logging(home, foreground=foreground)
+
+log = logging.getLogger('loggerhead')
+log.info('Starting up...')
+
+log.info('Loading the bzr plugins...')
+from bzrlib.plugin import load_plugins
+load_plugins()
+
+import bzrlib.plugins
+if getattr(bzrlib.plugins, 'loom', None) is None:
+    log.error('Loom plugin loading failed.')
+
+from launchpad_loggerhead.debug import (
+    change_kill_thread_criteria, threadpool_debug)
+from launchpad_loggerhead.app import RootApp
+from launchpad_loggerhead.session import SessionHandler
+
+SESSION_VAR = 'lh.session'
+
+secret = open(os.path.join(config.root, config.codebrowse.secret_path)).read()
+
+app = RootApp(SESSION_VAR)
+app = HTTPExceptionHandler(app)
+app = SessionHandler(app, SESSION_VAR, secret)
+def log_on_request_start(app):
+    def wrapped(environ, start_response):
+        log = logging.getLogger('loggerhead')
+        log.info("Starting to process %s", construct_url(environ))
+        return app(environ, start_response)
+    return wrapped
+app = log_on_request_start(app)
+app = PrefixMiddleware(app)
+app = TransLogger(app)
+app = threadpool_debug(app)
+
+def set_scheme(app):
+    """Set wsgi.url_scheme in the environment correctly.
+
+    We serve requests that originated from both http and https, and
+    distinguish between them by adding a header in the https Apache config.
+    """
+    def wrapped(environ, start_response):
+        environ['wsgi.url_scheme'] = environ.pop(
+            'HTTP_X_FORWARDED_SCHEME', 'http')
+        return app(environ, start_response)
+    return wrapped
+app = set_scheme(app)
+app = change_kill_thread_criteria(app)
+
+try:
+    httpserver.serve(
+        app, host=LISTEN_HOST, port=LISTEN_PORT,
+        threadpool_workers=THREADPOOL_WORKERS,
+        threadpool_options={
+            # Kill threads after 300 seconds.  This is insanely high, but
+            # lower enough than the default (1800 seconds!) that evidence
+            # suggests it will be hit occasionally, and there's very little
+            # chance of it having negative consequences.
+            'kill_thread_limit': 300,
+            # Check for threads that should be killed every 10 requests.  The
+            # default is every 100, which is easily long enough for things to
+            # gum up completely in between checks.
+            'hung_check_period': 10,
+            })
+finally:
+    log.info('Shutdown.')
+    try:
+        os.remove(pidfile)
+    except OSError:
+        pass
 
=== added file 'scripts/stop-loggerhead.py'
--- scripts/stop-loggerhead.py	1970-01-01 00:00:00 +0000
+++ scripts/stop-loggerhead.py	2010-04-27 02:02:42 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env python2.4
+#
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+import os
+import sys
+
+home = os.path.realpath(os.path.dirname(__file__))
+pidfile = os.path.join(home, 'loggerhead.pid')
+
+try:
+    f = open(pidfile, 'r')
+except IOError, e:
+    print 'No pid file found.'
+    sys.exit(1)
+
+pid = int(f.readline())
+
+try:
+    os.kill(pid, 0)
+except OSError, e:
+    print 'Stale pid file; server is not running.'
+    sys.exit(1)
+
+print
+print 'Shutting down previous server @ pid %d.' % (pid,)
+print
+
+import signal
+os.kill(pid, signal.SIGTERM)
 
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-04-21 12:30:48 +0000
+++ utilities/sourcedeps.conf	2010-04-27 02:02:42 +0000
@@ -5,7 +5,6 @@
 bzr-svn lp:~launchpad-pqm/bzr-svn/devel;revno=2708
 cscvs lp:~launchpad-pqm/launchpad-cscvs/devel;revno=432
 dulwich lp:~launchpad-pqm/dulwich/devel;revno=418
-launchpad-loggerhead lp:~launchpad-pqm/launchpad-loggerhead/devel;revno=54
 loggerhead lp:~launchpad-pqm/loggerhead/devel;revno=174
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976