Author: aconway
Date: Thu Jan 7 18:49:12 2010
New Revision: 896959
URL: http://svn.apache.org/viewvc?rev=896959&view=rev
Log:
Add cluster watchdog plugin to cmake build.
Modified:
qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
qpid/trunk/qpid/cpp/src/cluster.cmake
qpid/trunk/qpid/cpp/src/config.h.cmake
qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
Modified: qpid/trunk/qpid/cpp/BuildInstallSettings.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/BuildInstallSettings.cmake?rev=896959&r1=896958&r2=896959&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/BuildInstallSettings.cmake (original)
+++ qpid/trunk/qpid/cpp/BuildInstallSettings.cmake Thu Jan 7 18:49:12 2010
@@ -129,4 +129,6 @@
"Directory to load client plug-in modules from")
set (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon CACHE STRING
"Directory to load broker plug-in modules from")
+ set (QPID_LIBEXEC_DIR libexec/qpid CACHE STRING
+ "Directory for executables used by qpid libs")
endif (UNIX)
Modified: qpid/trunk/qpid/cpp/src/cluster.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/cluster.cmake?rev=896959&r1=896958&r2=896959&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/cluster.cmake (original)
+++ qpid/trunk/qpid/cpp/src/cluster.cmake Thu Jan 7 18:49:12 2010
@@ -151,6 +151,11 @@
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
+ add_library (watchdog MODULE qpid/cluster/WatchDogPlugin.cpp)
+ set_target_properties (watchdog PROPERTIES PREFIX "")
+
+ add_executable(qpidd_watchdog qpid/cluster/qpidd_watchdog.cpp)
+
endif (BUILD_CLUSTER)
# Distribute all sources.
Modified: qpid/trunk/qpid/cpp/src/config.h.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/config.h.cmake?rev=896959&r1=896958&r2=896959&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/config.h.cmake (original)
+++ qpid/trunk/qpid/cpp/src/config.h.cmake Thu Jan 7 18:49:12 2010
@@ -37,6 +37,8 @@
#cmakedefine QPIDC_MODULE_DIR "${QPIDC_MODULE_DIR}"
#cmakedefine QPIDD_MODULE_DIR "${QPIDD_MODULE_DIR}"
+#cmakedefine QPID_LIBEXEC_DIR "${QPID_LIBEXEC_DIR}"
+
#define QPID_MODULE_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}"
#cmakedefine QPID_HAS_CLOCK_GETTIME
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp?rev=896959&r1=896958&r2=896959&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp Thu Jan 7 18:49:12
2010
@@ -38,6 +38,7 @@
clients of the stuck process to fail over to other members.
*/
+#include "config.h"
#include "qpid/Plugin.h"
#include "qpid/Options.h"
#include "qpid/log/Statement.h"
@@ -114,7 +115,7 @@
void child() { // Child of fork
const char* watchdog = ::getenv("QPID_WATCHDOG_EXEC"); // For use in
tests
- if (!watchdog) watchdog=QPID_EXEC_DIR "/qpidd_watchdog";
+ if (!watchdog) watchdog=QPID_LIBEXEC_DIR "/qpidd_watchdog";
std::string interval =
boost::lexical_cast<std::string>(settings.interval);
::execl(watchdog, watchdog, interval.c_str(), NULL);
QPID_LOG(critical, "Failed to exec watchdog program " << watchdog );
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
