1 files changed, 33 insertions, 6 deletions
diff --git a/sca-cpp/trunk/modules/edit/start b/sca-cpp/trunk/modules/edit/start
index 361cead2df..c3ef1f7c4d 100755
--- a/sca-cpp/trunk/modules/edit/start
+++ b/sca-cpp/trunk/modules/edit/start
@@ -23,6 +23,18 @@
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
 
+# Configure and start logging
+if [ -x ../../components/log/scribe-cat ]; then
+    ../../components/log/scribed-central-conf tmp
+    ../../components/log/scribed-client-conf tmp localhost
+    ../../components/log/scribed-central-start tmp
+    ../../components/log/scribed-client-start tmp
+fi
+
+# Start memcached
+../../components/cache/memcached-start 11211
+../../components/cache/memcached-start 11212
+
 # Configure server
 ../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
 ../../modules/http/httpd-event-conf tmp
@@ -31,8 +43,26 @@ jsprefix=`echo "import os; print os.path.realpath('$here/../js')" | python`
 ../server/server-conf tmp
 ../python/python-conf tmp
 
+# Configure server log streaming
+if [ -x ../../components/log/scribe-cat ]; then
+    cat >tmp/conf/log.conf <<EOF
+# Generated by: start $*
+ErrorLog "|$here/../../components/log/scribe-cat server"
+CustomLog "|$here/../../components/log/scribe-cat server" combined
+
+EOF
+
+    cat >tmp/conf/log-ssl.conf <<EOF
+# Generated by: start $*
+CustomLog "|$here/../../components/log/scribe-cat server" sslcombined
+
+EOF
+
+fi
+
 # Configure error pages
 cat >>tmp/conf/svhost.conf <<EOF
+# Generated by: start $*
 # Error pages
 ErrorDocument 404 /public/notfound/
 ErrorDocument 401 /public/notauth/
@@ -43,6 +73,7 @@ EOF
 
 # Configure SCA contributions
 cat >>tmp/conf/httpd.conf <<EOF
+# Generated by: start $*
 # Configure SCA Composite
 SCAContribution `pwd`/
 SCAComposite edit.composite
@@ -55,7 +86,7 @@ EOF
 
 # Configure resource aliases
 cat >>tmp/conf/httpd.conf <<EOF
-
+# Generated by: start $*
 Alias /home/home.png $here/htdocs/home/home.png
 Alias /home/home.b64 $here/htdocs/home/home.b64
 
@@ -66,7 +97,7 @@ EOF
 
 # Configure app resource aliases
 cat >>tmp/conf/svhost.conf <<EOF
-
+# Generated by: start $*
 <Location /v>
 RewriteEngine on
 
@@ -85,10 +116,6 @@ EOF
 # Create application database directories
 mkdir -p tmp/appdata/filedb
 
-# Start memcached
-../../components/cache/memcached-start 11211
-../../components/cache/memcached-start 11212
-
 # Start server
 ../../modules/http/httpd-start tmp