From 681567b28116421496c4b7560a5b70f9730b8a79 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 23 Dec 2011 08:18:38 +0000
Subject: Use HTTPD ap_log_error instead of stderr to log when running inside
 HTTPD, to get log piping and rotation to work.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1222604 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/components/cache/datacache.cpp                | 1 +
 sca-cpp/trunk/components/cache/memcache.cpp                 | 1 +
 sca-cpp/trunk/components/cache/memocache.cpp                | 1 +
 sca-cpp/trunk/components/chat/chat-sender.cpp               | 1 +
 sca-cpp/trunk/components/chat/chat-sender2.cpp              | 1 +
 sca-cpp/trunk/components/chat/chat-sendreceiver.cpp         | 1 +
 sca-cpp/trunk/components/constdb/constdb.cpp                | 1 +
 sca-cpp/trunk/components/filedb/filedb.cpp                  | 1 +
 sca-cpp/trunk/components/http/httpdelete.cpp                | 1 +
 sca-cpp/trunk/components/http/httpget.cpp                   | 1 +
 sca-cpp/trunk/components/http/httppatch.cpp                 | 1 +
 sca-cpp/trunk/components/http/httppost.cpp                  | 1 +
 sca-cpp/trunk/components/http/httpput.cpp                   | 1 +
 sca-cpp/trunk/components/kvdb/kvdb.cpp                      | 1 +
 sca-cpp/trunk/components/log/log.cpp                        | 1 +
 sca-cpp/trunk/components/log/logger.cpp                     | 1 +
 sca-cpp/trunk/components/log/scribe.hpp                     | 1 +
 sca-cpp/trunk/components/queue/queue-listener.cpp           | 1 +
 sca-cpp/trunk/components/queue/queue-sender.cpp             | 1 +
 sca-cpp/trunk/components/sqldb/sqldb.cpp                    | 1 +
 sca-cpp/trunk/components/webservice/axis2-dispatcher.cpp    | 1 +
 sca-cpp/trunk/components/webservice/axis2-service.cpp       | 1 +
 sca-cpp/trunk/components/webservice/webservice-client.cpp   | 1 +
 sca-cpp/trunk/components/webservice/webservice-listener.cpp | 1 +
 24 files changed, 24 insertions(+)

(limited to 'sca-cpp/trunk/components')

diff --git a/sca-cpp/trunk/components/cache/datacache.cpp b/sca-cpp/trunk/components/cache/datacache.cpp
index 994aa4840e..f7e812dd18 100644
--- a/sca-cpp/trunk/components/cache/datacache.cpp
+++ b/sca-cpp/trunk/components/cache/datacache.cpp
@@ -31,6 +31,7 @@
  * meantime the updates will be retrieved from the level1 cache).
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/cache/memcache.cpp b/sca-cpp/trunk/components/cache/memcache.cpp
index 768bcffb67..7547ec65df 100644
--- a/sca-cpp/trunk/components/cache/memcache.cpp
+++ b/sca-cpp/trunk/components/cache/memcache.cpp
@@ -23,6 +23,7 @@
  * Memcached-based cache component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/cache/memocache.cpp b/sca-cpp/trunk/components/cache/memocache.cpp
index 2482c2202b..054638e275 100644
--- a/sca-cpp/trunk/components/cache/memocache.cpp
+++ b/sca-cpp/trunk/components/cache/memocache.cpp
@@ -29,6 +29,7 @@
  * cache without actually applying the function.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/chat/chat-sender.cpp b/sca-cpp/trunk/components/chat/chat-sender.cpp
index d3726a4e1c..5e289d7eac 100644
--- a/sca-cpp/trunk/components/chat/chat-sender.cpp
+++ b/sca-cpp/trunk/components/chat/chat-sender.cpp
@@ -23,6 +23,7 @@
  * XMPP chat sender component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/chat/chat-sender2.cpp b/sca-cpp/trunk/components/chat/chat-sender2.cpp
index 2224f64542..05dec36270 100644
--- a/sca-cpp/trunk/components/chat/chat-sender2.cpp
+++ b/sca-cpp/trunk/components/chat/chat-sender2.cpp
@@ -25,6 +25,7 @@
  * input data from component references instead of function parameters.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp b/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
index 610f3cc9cc..ddc12bb164 100644
--- a/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
+++ b/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
@@ -23,6 +23,7 @@
  * XMPP chat sender/receiver component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/constdb/constdb.cpp b/sca-cpp/trunk/components/constdb/constdb.cpp
index c76206b550..94df433a67 100644
--- a/sca-cpp/trunk/components/constdb/constdb.cpp
+++ b/sca-cpp/trunk/components/constdb/constdb.cpp
@@ -23,6 +23,7 @@
  * TinyCDB-based database component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/filedb/filedb.cpp b/sca-cpp/trunk/components/filedb/filedb.cpp
index 5f755de3eb..ac4c3faa6b 100644
--- a/sca-cpp/trunk/components/filedb/filedb.cpp
+++ b/sca-cpp/trunk/components/filedb/filedb.cpp
@@ -23,6 +23,7 @@
  * File based database component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/http/httpdelete.cpp b/sca-cpp/trunk/components/http/httpdelete.cpp
index 5f3f8ead11..109049f75d 100644
--- a/sca-cpp/trunk/components/http/httpdelete.cpp
+++ b/sca-cpp/trunk/components/http/httpdelete.cpp
@@ -23,6 +23,7 @@
  * HTTP client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/http/httpget.cpp b/sca-cpp/trunk/components/http/httpget.cpp
index fc89784749..59dc231209 100644
--- a/sca-cpp/trunk/components/http/httpget.cpp
+++ b/sca-cpp/trunk/components/http/httpget.cpp
@@ -23,6 +23,7 @@
  * HTTP client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/http/httppatch.cpp b/sca-cpp/trunk/components/http/httppatch.cpp
index ef72537185..06810e5d90 100644
--- a/sca-cpp/trunk/components/http/httppatch.cpp
+++ b/sca-cpp/trunk/components/http/httppatch.cpp
@@ -23,6 +23,7 @@
  * HTTP client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/http/httppost.cpp b/sca-cpp/trunk/components/http/httppost.cpp
index 0879ad2e59..f4b85710bb 100644
--- a/sca-cpp/trunk/components/http/httppost.cpp
+++ b/sca-cpp/trunk/components/http/httppost.cpp
@@ -23,6 +23,7 @@
  * HTTP client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/http/httpput.cpp b/sca-cpp/trunk/components/http/httpput.cpp
index 1eef0bef48..448456652b 100644
--- a/sca-cpp/trunk/components/http/httpput.cpp
+++ b/sca-cpp/trunk/components/http/httpput.cpp
@@ -23,6 +23,7 @@
  * HTTP client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/kvdb/kvdb.cpp b/sca-cpp/trunk/components/kvdb/kvdb.cpp
index 70ae1eda74..bab4e5d82b 100644
--- a/sca-cpp/trunk/components/kvdb/kvdb.cpp
+++ b/sca-cpp/trunk/components/kvdb/kvdb.cpp
@@ -23,6 +23,7 @@
  * LevelDB-based database component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/log/log.cpp b/sca-cpp/trunk/components/log/log.cpp
index 24a5844c45..d43833680d 100644
--- a/sca-cpp/trunk/components/log/log.cpp
+++ b/sca-cpp/trunk/components/log/log.cpp
@@ -23,6 +23,7 @@
  * Scribe-based log component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/log/logger.cpp b/sca-cpp/trunk/components/log/logger.cpp
index e1f4712d61..eb18ed30db 100644
--- a/sca-cpp/trunk/components/log/logger.cpp
+++ b/sca-cpp/trunk/components/log/logger.cpp
@@ -24,6 +24,7 @@
  * and log service invocations.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/log/scribe.hpp b/sca-cpp/trunk/components/log/scribe.hpp
index 1e0ce46511..a7fecf9865 100644
--- a/sca-cpp/trunk/components/log/scribe.hpp
+++ b/sca-cpp/trunk/components/log/scribe.hpp
@@ -34,6 +34,7 @@
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
 #undef VERSION
+#undef OK
 
 // Ignore integer conversion issues in Thrift and Scribe headers
 #ifdef WANT_MAINTAINER_MODE
diff --git a/sca-cpp/trunk/components/queue/queue-listener.cpp b/sca-cpp/trunk/components/queue/queue-listener.cpp
index d714101583..394d462839 100644
--- a/sca-cpp/trunk/components/queue/queue-listener.cpp
+++ b/sca-cpp/trunk/components/queue/queue-listener.cpp
@@ -23,6 +23,7 @@
  * AMQP queue listener component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/queue/queue-sender.cpp b/sca-cpp/trunk/components/queue/queue-sender.cpp
index 07f8491f54..1d5978e9a6 100644
--- a/sca-cpp/trunk/components/queue/queue-sender.cpp
+++ b/sca-cpp/trunk/components/queue/queue-sender.cpp
@@ -23,6 +23,7 @@
  * AMQP queue sender component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/sqldb/sqldb.cpp b/sca-cpp/trunk/components/sqldb/sqldb.cpp
index fa82c0ee9f..c2b178f13e 100644
--- a/sca-cpp/trunk/components/sqldb/sqldb.cpp
+++ b/sca-cpp/trunk/components/sqldb/sqldb.cpp
@@ -23,6 +23,7 @@
  * PostgreSQL-based database component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/webservice/axis2-dispatcher.cpp b/sca-cpp/trunk/components/webservice/axis2-dispatcher.cpp
index 3f753e0e35..dafa6fd229 100644
--- a/sca-cpp/trunk/components/webservice/axis2-dispatcher.cpp
+++ b/sca-cpp/trunk/components/webservice/axis2-dispatcher.cpp
@@ -23,6 +23,7 @@
  * Axis2/C module that dispatches all server requests to the Tuscany Axis/2C service.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "axis2.hpp"
 
 namespace tuscany {
diff --git a/sca-cpp/trunk/components/webservice/axis2-service.cpp b/sca-cpp/trunk/components/webservice/axis2-service.cpp
index 4c0ce22722..498f3aea92 100644
--- a/sca-cpp/trunk/components/webservice/axis2-service.cpp
+++ b/sca-cpp/trunk/components/webservice/axis2-service.cpp
@@ -23,6 +23,7 @@
  * Axis2/C service implementation that dispatches requests to SCA Web service components.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "value.hpp"
 #include "string.hpp"
 #include "../../modules/http/httpd.hpp"
diff --git a/sca-cpp/trunk/components/webservice/webservice-client.cpp b/sca-cpp/trunk/components/webservice/webservice-client.cpp
index 06db6c01b8..76d4905bf8 100644
--- a/sca-cpp/trunk/components/webservice/webservice-client.cpp
+++ b/sca-cpp/trunk/components/webservice/webservice-client.cpp
@@ -23,6 +23,7 @@
  * Web service client component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
diff --git a/sca-cpp/trunk/components/webservice/webservice-listener.cpp b/sca-cpp/trunk/components/webservice/webservice-listener.cpp
index 2127ecf0df..78a0ea9580 100644
--- a/sca-cpp/trunk/components/webservice/webservice-listener.cpp
+++ b/sca-cpp/trunk/components/webservice/webservice-listener.cpp
@@ -23,6 +23,7 @@
  * Web service listener component implementation.
  */
 
+#define WANT_HTTPD_LOG 1
 #include "string.hpp"
 #include "function.hpp"
 #include "list.hpp"
-- 
cgit v1.2.3