Merge lp:~xaav/launchpad/wiki into lp:launchpad

[xaav]

Currently a work in progress.

Will provide wiki support for Launchpad.

See http://dev.launchpad.net/LEP/Wiki for implementation details.

TODO:

- Serve from more than one branch
- Set code branch to serve from

Bugs that must be fixed before wikkid is used: https://bugs.launchpad.net/wikkid/+bugs?field.tag=lp-required

[lp:~xaav/launchpad/wiki]

13162. By xaav on 2011-06-07

renamed scripts

13163. By xaav on 2011-06-07

Imported paste.httpserver

13164. By xaav on 2011-06-07

adjusted start and stop wikkid.

Unmerged revisions

13164. By xaav on 2011-06-07

adjusted start and stop wikkid.

13163. By xaav on 2011-06-07

Imported paste.httpserver

13162. By xaav on 2011-06-07

renamed scripts

13161. By xaav on 2011-06-07

linked bug

13160. By xaav on 2011-06-07

Committed changes

13159. By xaav on 2011-06-07

Added wikkid start and stop scripts.

=== added file 'scripts/start-wikkid.py'
--- scripts/start-wikkid.py	1970-01-01 00:00:00 +0000
+++ scripts/start-wikkid.py	2011-06-07 16:52:40 +0000
@@ -0,0 +1,100 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010 Wikkid Developers.
+#
+# This software is licensed under the GNU Affero General Public License
+# version 3 (see the file LICENSE).
+
+"""The server class for the wiki."""
+
+try:
+    import _wikkid_path
+except ImportError:
+    # Not running from a branch.
+    pass
+
+import logging
+import optparse
+import sys
+
+from paste import httpserver
+
+from bzrlib.workingtree import WorkingTree
+
+from wikkid import version
+from wikkid.app import WikkidApp
+from wikkid.context import (
+    DEFAULT_FORMAT,
+    DEFAULT_HOST,
+    DEFAULT_PORT,
+    ExecutionContext,
+    )
+from wikkid.filestore.bzr import FileStore
+from wikkid.user.bzr import LocalBazaarUserMiddleware
+
+from canonical.config import config
+
+
+def setup_logging():
+    """Set up a logger sending to stderr."""
+    handler = logging.StreamHandler(sys.stderr)
+    fmt = '%(asctime)s %(levelname)-7s %(message)s'
+    formatter = logging.Formatter(
+        fmt=fmt, datefmt="%Y-%m-%d %H:%M:%S")
+    handler.setFormatter(formatter)
+    root = logging.getLogger()
+    root.addHandler(handler)
+    
+#TODO: Use paste.httpserver
+
+
+def main(args):
+    
+    LISTEN_HOST = config.wiki.listen_host
+    LISTEN_PORT = config.wiki.port
+    THREADPOOL_WORKERS = 10
+
+    execution_context = ExecutionContext(
+        host=LISTEN_HOST,
+        port=LISTEN_PORT,
+        default_format=options.default_format)
+
+
+    setup_logging()
+    logger = logging.getLogger('wikkid')
+    logger.setLevel(logging.INFO)
+
+    working_tree = WorkingTree.open(branch)
+    logger.info('Using: %s', working_tree)
+    filestore = FileStore(working_tree)
+
+    app = WikkidApp(filestore=filestore)
+    app = LocalBazaarUserMiddleware(app, working_tree.branch)
+        
+    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
+
+
+
+if __name__ == "__main__":
+    main(sys.argv)

=== added file 'scripts/stop-wikkid.py'
--- scripts/stop-wikkid.py	1970-01-01 00:00:00 +0000
+++ scripts/stop-wikkid.py	2011-06-07 16:52:40 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/python -S
+
+print "Not implemented"
\ No newline at end of file