Move the watchdog into ext/common/agents as well.

phusion · Dec 7, 2010 · a911aa3 · a911aa3
1 parent ba1f02e
commit a911aa3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/build/agents.rb b/build/agents.rb
@@ -22,7 +22,7 @@
 #  THE SOFTWARE.
 
 dependencies = [
-	'ext/common/Watchdog.cpp',
+	'ext/common/agents/Watchdog/Main.cpp',
 	'ext/common/ServerInstanceDir.h',
 	'ext/common/ResourceLocator.h',
 	'ext/common/Utils/VariantMap.h',
@@ -32,7 +32,7 @@
 file AGENT_OUTPUT_DIR + 'PassengerWatchdog' => dependencies do
 	sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
 	create_executable(AGENT_OUTPUT_DIR + 'PassengerWatchdog',
-		'ext/common/Watchdog.cpp',
+		'ext/common/agents/Watchdog/Main.cpp',
 		"-Iext -Iext/common #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} " <<
 		"#{LIBCOMMON} " <<
 		"#{LIBBOOST_OXT} " <<

diff --git a/build/common_library.rb b/build/common_library.rb
@@ -76,9 +76,9 @@ def define_common_library_task(namespace, output_dir, extra_compiler_flags = nil
 			MessageChannel.h
 			ServerInstanceDir.h
 			Utils/VariantMap.h),
-		'AgentBase.o' => %w(
-			AgentBase.cpp
-			AgentBase.h
+		'AgentsBase.o' => %w(
+			agents/Base.cpp
+			agents/Base.h
 			Utils/VariantMap.h),
 		#'BCrypt.o' => %w(
 		#	BCrypt.cpp

diff --git a/ext/common/AgentBase.cpp → ext/common/agents/Base.cpp b/ext/common/AgentBase.cpp → ext/common/agents/Base.cpp
@@ -40,8 +40,8 @@
 	#include <execinfo.h>
 #endif
 
+#include <agents/Base.h>
 #include "Constants.h"
-#include "AgentBase.h"
 #include "Exceptions.h"
 #include "Logging.h"
 

diff --git a/ext/common/AgentBase.h → ext/common/agents/Base.h b/ext/common/AgentBase.h → ext/common/agents/Base.h
diff --git a/ext/common/agents/HelperAgent/Main.cpp b/ext/common/agents/HelperAgent/Main.cpp
@@ -48,7 +48,7 @@
 #include <agents/HelperAgent/HttpStatusExtractor.h>
 #include <agents/HelperAgent/BacktracesServer.h>
 
-#include <AgentBase.h>
+#include <agents/Base.h>
 #include <Constants.h>
 #include <ApplicationPool/Pool.h>
 #include <ApplicationPool/Server.h>

diff --git a/ext/common/agents/LoggingAgent/Main.cpp b/ext/common/agents/LoggingAgent/Main.cpp
@@ -36,9 +36,9 @@
 #include <cerrno>
 #include <signal.h>
 
+#include <agents/Base.h>
 #include <agents/LoggingAgent/LoggingServer.h>
 
-#include <AgentBase.h>
 #include <AccountsDatabase.h>
 #include <Account.h>
 #include <ServerInstanceDir.h>

diff --git a/ext/common/Watchdog.cpp → ext/common/agents/Watchdog/Main.cpp b/ext/common/Watchdog.cpp → ext/common/agents/Watchdog/Main.cpp
@@ -38,8 +38,8 @@
 #include <cstring>
 #include <cerrno>
 
+#include <agents/Base.h>
 #include "Constants.h"
-#include "AgentBase.h"
 #include "ServerInstanceDir.h"
 #include "FileDescriptor.h"
 #include "MessageChannel.h"