[Checkins] SVN: grokproject/trunk/grokproject/template/ there was an inconsistency where the various logfiles we placed. fixed the situation by consistenly use the intended "{buildout}/var/log" location throughout.

[Jan-Wijbrand Kolman]

Log message for revision 121680:
  there was an inconsistency where the various logfiles we placed. fixed the situation by consistenly use the intended "{buildout}/var/log" location throughout.

Changed:
  U   grokproject/trunk/grokproject/template/buildout.cfg_tmpl
  U   grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl
  U   grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl
  D   grokproject/trunk/grokproject/template/log/

-=-
Modified: grokproject/trunk/grokproject/template/buildout.cfg_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2011-05-16 14:35:07 UTC (rev 121679)
+++ grokproject/trunk/grokproject/template/buildout.cfg_tmpl	2011-05-16 15:10:21 UTC (rev 121680)
@@ -17,10 +17,6 @@
     zope_conf_deploy
     zpasswd
     interactive_debugger
-# For backward compatibility, telling buildout not to throw away
-# the data and log subdirectories from the parts directory.
-    data
-    log
 newest = ${newest}
 versions = versions
 # eggs will be installed in the default buildout location
@@ -46,7 +42,7 @@
 cmd = $${buildout:bin-directory}/paster
 arguments = serve $${buildout:parts-directory}/etc/deploy.ini
     --daemon --pid-file=$${buildout:directory}/var/daemon.pid
-    --log-file=$${buildout:directory}/log/daemon.log
+    --log-file=$${buildout:directory}/var/log/daemon.log
 
 [paster_ini_debug]
 recipe = collective.recipe.template
@@ -74,8 +70,8 @@
 [mkdirs]
 recipe = z3c.recipe.mkdir
 paths =
+    $${buildout:directory}/var/log
     $${zope_conf:filestorage}
-    $${zope_conf:logfiles}
     $${zope_conf:blobstorage}
 
 [site_zcml]
@@ -92,7 +88,6 @@
 input = etc/zope.conf.in
 filestorage = $${buildout:directory}/var/filestorage
 blobstorage = $${buildout:directory}/var/blobstorage
-logfiles = $${buildout:directory}/var/log
 # 'extra' is copied verbatim. Use it for product config sections and so.
 extra =
 
@@ -124,13 +119,3 @@
 entry-points =
   interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
 arguments = zope_conf="$${zope_conf_debug:output}"
-
-# The [data] and [log] parts are still in here to instruct buildout to not
-# unintentionally throw away the parts/data and parts/log subdirectories
-# that contain the Data.fs and the log files. These files should be
-# copied to the new locations. See the upgrade notes for more information.
-[data]
-recipe = zc.recipe.filestorage
-
-[log]
-recipe = zc.recipe.filestorage

Modified: grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl	2011-05-16 14:35:07 UTC (rev 121679)
+++ grokproject/trunk/grokproject/template/etc/deploy.ini.in_tmpl	2011-05-16 15:10:21 UTC (rev 121680)
@@ -55,13 +55,13 @@
 
 [handler_eventlog]
 class = FileHandler
-args = (os.path.join(r'$${buildout:directory}', 'log', 'event.log'), 'a')
+args = (os.path.join(r'$${buildout:directory}', 'var', 'log', 'event.log'), 'a')
 level = NOTSET
 formatter = generic
 
 [handler_accesslog]
 class = FileHandler
-args = (os.path.join(r'$${buildout:directory}', 'log', 'accesslog.log'), 'a')
+args = (os.path.join(r'$${buildout:directory}', 'var', 'log', 'accesslog.log'), 'a')
 level = INFO
 formatter = accesslog
 

Modified: grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl
===================================================================
--- grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl	2011-05-16 14:35:07 UTC (rev 121679)
+++ grokproject/trunk/grokproject/template/etc/zope.conf.in_tmpl	2011-05-16 15:10:21 UTC (rev 121680)
@@ -28,7 +28,9 @@
 </zodb>
 
 <eventlog>
-# logfiles are setup in the debug.ini and deploy.ini files.
+# This section is intentionally left empty as acces logging and error
+# logging are handled by paster. In other words, Grok itself is setup not
+# to do logging. Logfiles are setup in the debug.ini and deploy.ini files.
 </eventlog>
 
 devmode $${devmode}