test/cxx/ApplicationPool2/SmartSpawnerTest.cpp in passenger-4.0.45 vs test/cxx/ApplicationPool2/SmartSpawnerTest.cpp in passenger-4.0.46

@@ -45,14 +45,14 @@
 			if (exitImmediately) {
 				command.push_back("exit-immediately");
 			}
 			
 			return boost::make_shared<SmartSpawner>(
-				*resourceLocator,
 				generation,
 				command,
-				options);
+				options,
+				make_shared<SpawnerConfig>(*resourceLocator));
 		}
 		
 		Options createOptions() {
 			Options options;
 			options.spawnMethod = "smart";
@@ -76,19 +76,19 @@
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options);
+		setLogLevel(LVL_CRIT);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		
 		kill(spawner->getPreloaderPid(), SIGTERM);
 		// Give it some time to exit.
 		usleep(300000);
 		
 		// No exception at next spawn.
-		setLogLevel(-1);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 	}
 	
 	TEST_METHOD(81) {
@@ -96,11 +96,11 @@
 		// SmartSpawner will throw an exception.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
-		setLogLevel(-1);
+		setLogLevel(LVL_CRIT);
 		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
 			fail("SpawnException expected");
@@ -122,14 +122,15 @@
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2; sleep 60");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 			fail("SpawnException expected");
@@ -152,15 +153,16 @@
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
-		
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
+
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
@@ -182,14 +184,15 @@
 		vector<string> preloaderCommand;
 		preloaderCommand.push_back("bash");
 		preloaderCommand.push_back("-c");
 		preloaderCommand.push_back("echo hello world >&2");
 		SmartSpawner spawner(
-			*resourceLocator,
 			generation,
 			preloaderCommand,
-			options);
+			options,
+			make_shared<SpawnerConfig>(*resourceLocator));
+		setLogLevel(LVL_CRIT);
 		
 		try {
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 			fail("SpawnException expected");
@@ -209,13 +212,13 @@
 		{
 			vector<string> preloaderCommand;
 			preloaderCommand.push_back("ruby");
 			preloaderCommand.push_back(resourceLocator->getHelperScriptsDir() + "/rack-preloader.rb");
 			SmartSpawner spawner(
-				*resourceLocator,
 				generation,
 				preloaderCommand,
-				options);
+				options,
+				make_shared<SpawnerConfig>(*resourceLocator));
 			process = spawner.spawn(options);
 			process->requiresShutdown = false;
 		}
 		
 		SessionPtr session = process->newSession();