Changeset 5733

Timestamp:

11/20/08 09:18:13 (2 months ago)

Author:

carndt

Message:

Apply patch for #2013 (add config option to set CatWalk session dir) with modifications

Files:

• branches/1.1/turbogears/qstemplates/quickstart/+package+/config/app.cfg_tmpl (modified) (1 diff)
• branches/1.1/turbogears/toolbox/catwalk/__init__.py (modified) (2 diffs)

branches/1.1/turbogears/qstemplates/quickstart/+package+/config/app.cfg_tmpl

@@ -90 +90 @@
-# Set internationalization
-# i18n.run_template_filter = True
+
+# CatWalk session directory
+# You may need to set this to the path of a directory with write access for
+# your server, e.g. if you deploy behind mod-wsgi and you want to use CatWalk
+# mounted in your own controllers.
+# By default CatWalk stores its session data in the directory 'catwalk-session'
+# below your application's package directory or below the current directory.
+# The path may be absolute or relative to the current working directory of your
+# server. The directory will be created if it does not exist, so make sure it
+# either exists already or the server has write access in the parent directory
+# as well. Example:
+# catwalk.session_dir = "/absolute/path/to/catwalk-session-dir"
+# Default:
+# catwalk.session_dir = 'catwalk-session'
-
-#if $identity != 'none'

branches/1.1/turbogears/toolbox/catwalk/__init__.py

@@ -26 +26 @@
-
-import turbogears
-
+config, 
-
-
@@ -592 +592 @@
-        """Return the path to the catwalk session pickle.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        catwalk_session_dir = os.path.abspath(catwalk_session_dir)
-        if not os.path.exists(catwalk_session_dir):
-            try:
-                os.mkdir(catwalk_session_dir)
-IOError
+(IOError, OSError)
-                msg = 'Fail to create session directory %s' % e
-                raise cherrypy.HTTPRedirect(turbogears.url('error', msg=msg))