changeset 3576:08a8965162fe

rename ./moin.py to wikiserver.py, add wikiserverlogging.conf to configure its logging
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 11 May 2008 18:35:14 +0200
parents 0b7eb697e952
children 6b1b444b45f9
files docs/CHANGES moin.py wikiserver.py wikiserverlogging.conf
diffstat 4 files changed, 80 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/docs/CHANGES	Sun May 11 08:26:52 2008 +0200
+++ b/docs/CHANGES	Sun May 11 18:35:14 2008 +0200
@@ -72,6 +72,16 @@
       If you like to simultaneously support multiple languages, use something
       like this: ur'(?P<all>(Kategorie|Category)(?P<key>\S+))'
 
+  Other changes:
+    * HINT: in the toplevel dir, we have renamed moin.py to wikiserver.py (it
+      was often confused with the moin scripting command).
+      Now you have:
+      * wikiserver.py - to start the standalone server
+      * wikiserverconfig.py - to configure the standalone server
+      * wikiserverlogging.conf - to configure logging for it (default config
+        should be ok for all day use, but can easily be modified for debugging)
+      * wikiconfig.py - to configure the wiki engine
+
   Developer notes (these should be moved to the end in the release):
     * Page.last_edit() is DEPRECATED, please use Page.edit_info().
     * Page._last_edited() is GONE (was broken anyway), please use
--- a/moin.py	Sun May 11 08:26:52 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-"""
-    Start script for the standalone Wiki server.
-
-    @copyright: 2007 MoinMoin:ForrestVoight
-    @license: GNU GPL, see COPYING for details.
-"""
-
-import os, sys
-
-# Path to MoinMoin package, needed if you installed with --prefix=PREFIX
-# or if you did not use setup.py.
-#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages')
-
-moinpath = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
-sys.path.insert(0, moinpath)
-os.chdir(moinpath)
-
-from MoinMoin import log
-log.load_config('wiki/config/logging/stderr') # XXX maybe fix path
-
-from MoinMoin.script import MoinScript
-
-if __name__ == '__main__':
-    sys.argv = ["moin.py", "server", "standalone"]
-    MoinScript().run()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wikiserver.py	Sun May 11 18:35:14 2008 +0200
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+"""
+    Start script for the standalone Wiki server.
+
+    @copyright: 2007 MoinMoin:ForrestVoight
+    @license: GNU GPL, see COPYING for details.
+"""
+
+import os, sys
+
+# Path to MoinMoin package, needed if you installed with --prefix=PREFIX
+# or if you did not use setup.py.
+#sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages')
+
+moinpath = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
+sys.path.insert(0, moinpath)
+os.chdir(moinpath)
+
+from MoinMoin import log
+log.load_config('wikiserverlogging.conf')
+
+from MoinMoin.script import MoinScript
+
+if __name__ == '__main__':
+    sys.argv = ["moin.py", "server", "standalone"]
+    MoinScript().run()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wikiserverlogging.conf	Sun May 11 18:35:14 2008 +0200
@@ -0,0 +1,44 @@
+# This is the standalone wikiserver logging configuration.
+# It can be easily modified to help when debugging, see the comments.
+# Available loglevels, to adjust verbosity: DEBUG, INFO, WARNING, ERROR, CRITICAL
+
+[DEFAULT]
+logfile=moin.log
+
+[loggers]
+keys=root,moin_debug
+
+[logger_root]
+level=INFO
+handlers=stderr
+
+[logger_moin_debug]
+# adapt the next lines to your debugging needs:
+level=INFO
+handlers=stderr
+qualname=MoinMoin.auth
+propagate=0
+
+[handlers]
+keys=logfile,stderr
+
+[handler_logfile]
+class=FileHandler
+formatter=default
+level=DEBUG
+args=('%(logfile)s', 'at')
+
+[handler_stderr]
+class=StreamHandler
+formatter=default
+level=INFO
+args=(sys.stderr, )
+
+[formatters]
+keys=default
+
+[formatter_default]
+format=%(asctime)s %(name)s %(levelname)s %(message)s
+datefmt=
+class=logging.Formatter
+