move oldRouting into pool context from group

phusion · Jan 31, 2025 · eaf3953 · eaf3953
1 parent c07ce26
commit eaf3953
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/src/agent/Core/ApplicationPool/Context.h b/src/agent/Core/ApplicationPool/Context.h
@@ -61,16 +61,19 @@ struct Context {
 	boost::object_pool<Process> processObjectPool;
 	mutable boost::mutex agentConfigSyncher;
 
+	// Whether to use the old routing algorithm
+	bool oldRouting;
 
 	/****** Dependencies ******/
 
 	SpawningKit::FactoryPtr spawningKitFactory;
 	Json::Value agentConfig;
 
 
-	Context()
+	Context(bool _oldRouting)
 		: sessionObjectPool(64, 1024),
-		  processObjectPool(4, 64)
+		  processObjectPool(4, 64),
+		  oldRouting(_oldRouting)
 		{ }
 
 	void finalize() {

diff --git a/src/agent/Core/ApplicationPool/Group.h b/src/agent/Core/ApplicationPool/Group.h
@@ -200,9 +200,6 @@ class Group: public boost::enable_shared_from_this<Group> {
 	Callback shutdownCallback;
 	GroupPtr selfPointer;
 
-	// Whether to use the old routing algorithm
-	bool oldRouting;
-
 	/****** Initialization and shutdown ******/
 
 	static ApiKey generateApiKey(const Pool *pool);

diff --git a/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp b/src/agent/Core/ApplicationPool/Group/InitializationAndShutdown.cpp
@@ -136,7 +136,6 @@ Group::Group(Pool *_pool, const Options &_options)
 	}
 
 	detachedProcessesCheckerActive = false;
-	oldRouting = _options.oldRouting;
 }
 
 Group::~Group() {

diff --git a/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp b/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp
@@ -359,7 +359,7 @@ Group::get(const Options &newOptions, const GetCallback &callback,
 
 bool
 Group::useNewRouting() const {
-	return !oldRouting;
+	return !pool->context->oldRouting;
 }
 
 } // namespace ApplicationPool2

diff --git a/src/agent/Core/ApplicationPool/Options.h b/src/agent/Core/ApplicationPool/Options.h
@@ -442,8 +442,6 @@ class Options {
 
 	/*********************************/
 
-	bool oldRouting;
-
 	/**
 	 * Creates a new Options object with the default values filled in.
 	 * One must still set appRoot manually, after having used this constructor.
@@ -481,8 +479,7 @@ class Options {
 		  statThrottleRate(DEFAULT_STAT_THROTTLE_RATE),
 		  maxRequests(0),
 		  currentTime(0),
-		  noop(false),
-		  oldRouting(false)
+		  noop(false)
 		  /*********************************/
 	{
 		/*********************************/

diff --git a/src/agent/Core/Controller/InitRequest.cpp b/src/agent/Core/Controller/InitRequest.cpp
@@ -206,7 +206,6 @@ Controller::fillPoolOptionsFromConfigCaches(Options &options,
 	options.statThrottleRate = mainConfig.statThrottleRate;
 	options.maxRequests = requestConfig->defaultMaxRequests;
 	options.stickySessionsCookieAttributes = requestConfig->defaultStickySessionsCookieAttributes;
-	options.oldRouting = mainConfig.oldRouting;
 	/******************************/
 }
 

diff --git a/src/agent/Core/CoreMain.cpp b/src/agent/Core/CoreMain.cpp
@@ -719,7 +719,7 @@ initializeNonPrivilegedWorkingObjects() {
 	wo->spawningKitContext->finalize();
 
 	UPDATE_TRACE_POINT();
-	wo->appPoolContext = boost::make_shared<ApplicationPool2::Context>();
+	wo->appPoolContext = boost::make_shared<ApplicationPool2::Context>(coreConfig->get("old_routing").asBool());
 	wo->appPoolContext->spawningKitFactory = boost::make_shared<SpawningKit::Factory>(
 		wo->spawningKitContext.get());
 	wo->appPoolContext->agentConfig = coreConfig->inspectEffectiveValues();
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,6 @@ Group::Group(Pool *_pool, const Options &_options) @@
     	}
     	detachedProcessesCheckerActive = false;
-    	oldRouting = _options.oldRouting;
     }
     Group::~Group() {
@@ Expand Down @@