passenger 4.0.48 → 4.0.49

data/ext/common/agents/LoggingAgent/Main.cpp

@@ -176,7 +176,7 @@ initializePrivilegedWorkingObjects(WorkingObjects &wo) {
 		} while (ret == -1 && errno == EINTR);
 	}
 
-	wo.adminAccountsDatabase = boost::make_shared<AccountsDatabase>();	
+	wo.adminAccountsDatabase = boost::make_shared<AccountsDatabase>();
 	wo.adminAccountsDatabase->add("_passenger-status", adminToolStatusPassword, false);
 	wo.adminServer = boost::make_shared<MessageServer>(parseUnixSocketAddress(adminSocketAddress),
 		wo.adminAccountsDatabase);
@@ -185,7 +185,7 @@ initializePrivilegedWorkingObjects(WorkingObjects &wo) {
 static void
 lowerPrivilege(const string &username, const struct passwd *user, gid_t gid) {
 	int e;
-	
+
 	if (initgroups(username.c_str(), gid) != 0) {
 		e = errno;
 		P_WARN("WARNING: Unable to set supplementary groups for " <<
@@ -216,7 +216,7 @@ maybeLowerPrivilege() {
 	gid_t gid;
 
 	/* Sanity check user accounts. */
-		
+
 	user = getpwnam(username.c_str());
 	if (user == NULL) {
 		throw NonExistentUserException(string("The configuration option ") +
@@ -225,7 +225,7 @@ maybeLowerPrivilege() {
 			username + "', but this user doesn't exist. Please fix " +
 			"the configuration option.");
 	}
-	
+
 	if (groupname.empty()) {
 		gid = user->pw_gid;
 		groupname = getGroupName(user->pw_gid);
@@ -249,7 +249,7 @@ maybeLowerPrivilege() {
 static struct ev_loop *
 createEventLoop() {
 	struct ev_loop *loop;
-	
+
 	// libev doesn't like choosing epoll and kqueue because the author thinks they're broken,
 	// so let's try to force it.
 	loop = ev_default_loop(EVBACKEND_EPOLL);
@@ -310,14 +310,14 @@ runMainLoop(WorkingObjects &wo) {
 	ev::sig sigintWatcher(eventLoop);
 	ev::sig sigtermWatcher(eventLoop);
 	ev::sig sigquitWatcher(eventLoop);
-	
+
 	sigintWatcher.set<&caughtExitSignal>();
 	sigintWatcher.start(SIGINT);
 	sigtermWatcher.set<&caughtExitSignal>();
 	sigtermWatcher.start(SIGTERM);
 	sigquitWatcher.set<&printInfo>();
 	sigquitWatcher.start(SIGQUIT);
-	
+
 	P_WARN("PassengerLoggingAgent online, listening at " << socketAddress);
 	if (feedbackFdAvailable()) {
 		feedbackFdWatcher.set<&feedbackFdBecameReadable>();

data/ext/common/agents/LoggingAgent/RemoteSender.h

@@ -64,29 +64,29 @@ private:
 		string nodeName;
 		string category;
 		string data;
-		
+
 		Item() {
 			exit = false;
 			compressed = false;
 		}
 	};
-	
+
 	class Server {
 	private:
 		string ip;
 		unsigned short port;
 		string certificate;
 		const CurlProxyInfo *proxyInfo;
-		
+
 		CURL *curl;
 		struct curl_slist *headers;
 		char lastErrorMessage[CURL_ERROR_SIZE];
 		string hostHeader;
 		string responseBody;
-		
+
 		string pingURL;
 		string sinkURL;
-		
+
 		void resetConnection() {
 			if (curl != NULL) {
 				#ifdef HAS_CURL_EASY_RESET
@@ -122,7 +122,7 @@ private:
 			setCurlProxy(curl, *proxyInfo);
 			responseBody.clear();
 		}
-		
+
 		void prepareRequest(const string &url) {
 			curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 			responseBody.clear();
@@ -181,13 +181,13 @@ private:
 			P_ERROR("Could not send data to Union Station gateway server " << ip
 				<< ": " << lastErrorMessage);
 		}
-		
+
 		static size_t curlDataReceived(void *buffer, size_t size, size_t nmemb, void *userData) {
 			Server *self = (Server *) userData;
 			self->responseBody.append((const char *) buffer, size * nmemb);
 			return size * nmemb;
 		}
-		
+
 	public:
 		Server(const string &ip, const string &hostName, unsigned short port, const string &cert,
 			const CurlProxyInfo *proxyInfo)
@@ -196,25 +196,25 @@ private:
 			this->port = port;
 			certificate = cert;
 			this->proxyInfo = proxyInfo;
-			
+
 			hostHeader = "Host: " + hostName;
 			headers = NULL;
 			headers = curl_slist_append(headers, hostHeader.c_str());
 			if (headers == NULL) {
 				throw IOException("Unable to create a CURL linked list");
 			}
-			
-			// Older libcurl versions didn't strdup() any option 
+
+			// Older libcurl versions didn't strdup() any option
 			// strings so we need to keep these in memory.
 			pingURL = string("https://") + ip + ":" + toString(port) +
 				"/ping";
 			sinkURL = string("https://") + ip + ":" + toString(port) +
 				"/sink";
-			
+
 			curl = NULL;
 			resetConnection();
 		}
-		
+
 		~Server() {
 			if (curl != NULL) {
 				curl_easy_cleanup(curl);
@@ -225,12 +225,12 @@ private:
 		string name() const {
 			return ip + ":" + toString(port);
 		}
-		
+
 		bool ping() {
 			P_DEBUG("Pinging Union Station gateway " << ip << ":" << port);
 			ScopeGuard guard(boost::bind(&Server::resetConnection, this));
 			prepareRequest(pingURL);
-			
+
 			curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 			if (curl_easy_perform(curl) != 0) {
 				P_DEBUG("Could not ping Union Station gateway server " << ip
@@ -247,7 +247,7 @@ private:
 				return false;
 			}
 		}
-		
+
 		/** Returns true if the server is up, false if the server is down.
 		 * The return value does NOT indicate whether the server accepted the data!
 		 * Thus, if (for example) the Union Station key is invalid or disabled,
@@ -259,11 +259,11 @@ private:
 		bool send(const Item &item) {
 			ScopeGuard guard(boost::bind(&Server::resetConnection, this));
 			prepareRequest(sinkURL);
-			
+
 			struct curl_httppost *post = NULL;
 			struct curl_httppost *last = NULL;
 			string base64_data;
-			
+
 			curl_formadd(&post, &last,
 				CURLFORM_PTRNAME, "key",
 				CURLFORM_PTRCONTENTS, item.unionStationKey.c_str(),
@@ -297,7 +297,7 @@ private:
 					CURLFORM_CONTENTSLENGTH, (long) item.data.size(),
 					CURLFORM_END);
 			}
-			
+
 			curl_easy_setopt(curl, CURLOPT_HTTPGET, 0);
 			curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
 			P_DEBUG("Sending Union Station packet: key=" << item.unionStationKey <<
@@ -305,7 +305,7 @@ private:
 				", compressedDataSize=" << item.data.size());
 			CURLcode code = curl_easy_perform(curl);
 			curl_formfree(post);
-			
+
 			if (code == CURLE_OK) {
 				guard.clear();
 				return handleSendResponse();
@@ -315,35 +315,35 @@ private:
 			}
 		}
 	};
-	
+
 	typedef boost::shared_ptr<Server> ServerPtr;
-	
+
 	string gatewayAddress;
 	unsigned short gatewayPort;
 	string certificate;
 	CurlProxyInfo proxyInfo;
 	BlockingQueue<Item> queue;
 	oxt::thread *thr;
-	
+
 	mutable boost::mutex syncher;
 	list<ServerPtr> servers;
 	time_t nextCheckupTime;
 	unsigned int packetsSent, packetsDropped;
-	
+
 	void threadMain() {
 		ScopeGuard guard(boost::bind(&RemoteSender::freeThreadData, this));
-		
+
 		while (true) {
 			Item item;
 			bool hasItem;
-			
+
 			if (firstStarted()) {
 				item = queue.get();
 				hasItem = true;
 			} else {
 				hasItem = queue.timedGet(item, msecUntilNextCheckup());
 			}
-			
+
 			if (hasItem) {
 				if (item.exit) {
 					return;
@@ -358,24 +358,24 @@ private:
 			}
 		}
 	}
-	
+
 	bool firstStarted() const {
 		boost::lock_guard<boost::mutex> l(syncher);
 		return nextCheckupTime == 0;
 	}
-	
+
 	void recheckServers() {
 		P_INFO("Rechecking Union Station gateway servers (" << gatewayAddress << ")...");
-		
+
 		vector<string> ips;
 		vector<string>::const_iterator it;
 		list<ServerPtr> servers;
 		string hostName;
 		bool someServersAreDown = false;
-		
+
 		ips = resolveHostname(gatewayAddress, gatewayPort);
 		P_INFO(ips.size() << " Union Station gateway servers found");
-		
+
 		for (it = ips.begin(); it != ips.end(); it++) {
 			ServerPtr server = boost::make_shared<Server>(*it, gatewayAddress, gatewayPort,
 				certificate, &proxyInfo);
@@ -386,7 +386,7 @@ private:
 			}
 		}
 		P_INFO(servers.size() << " Union Station gateway servers are up");
-		
+
 		if (servers.empty()) {
 			scheduleNextCheckup(5 * 60);
 		} else if (someServersAreDown) {
@@ -398,12 +398,12 @@ private:
 		boost::lock_guard<boost::mutex> l(syncher);
 		this->servers = servers;
 	}
-	
+
 	void freeThreadData() {
 		boost::lock_guard<boost::mutex> l(syncher);
 		servers.clear(); // Invoke destructors inside this thread.
 	}
-	
+
 	/**
 	 * Schedules the next checkup to be run after the given number
 	 * of seconds, unless there's already a checkup scheduled for
@@ -416,7 +416,7 @@ private:
 			P_DEBUG("Next checkup time in about " << seconds << " seconds");
 		}
 	}
-	
+
 	unsigned int msecUntilNextCheckup() const {
 		boost::lock_guard<boost::mutex> l(syncher);
 		time_t now = SystemTime::get();
@@ -426,17 +426,17 @@ private:
 			return (nextCheckupTime - now) * 1000;
 		}
 	}
-	
+
 	bool timeForCheckup() const {
 		boost::lock_guard<boost::mutex> l(syncher);
 		return SystemTime::get() >= nextCheckupTime;
 	}
-	
+
 	void sendOut(const Item &item) {
 		boost::unique_lock<boost::mutex> l(syncher);
 		bool sent = false;
 		bool someServersWentDown = false;
-		
+
 		while (!sent && !servers.empty()) {
 			// Pick first available server and put it on the back of the list
 			// for round-robin load balancing.
@@ -455,7 +455,7 @@ private:
 				packetsDropped++;
 			}
 		}
-		
+
 		if (someServersWentDown) {
 			if (servers.empty()) {
 				scheduleNextCheckup(5 * 60);
@@ -463,7 +463,7 @@ private:
 				scheduleNextCheckup(60 * 60);
 			}
 		}
-		
+
 		/* If all servers went down then all items in the queue will be
 		 * effectively dropped until after the next checkup has detected
 		 * servers that are up.
@@ -476,18 +476,18 @@ private:
 				", compressedDataSize=" << item.data.size());
 		}
 	}
-	
+
 	bool compress(const StaticString data[], unsigned int count, string &output) {
 		if (count == 0) {
 			StaticString newdata;
 			return compress(&newdata, 1, output);
 		}
-		
+
 		unsigned char out[128 * 1024];
 		z_stream strm;
 		int ret, flush;
 		unsigned int i, have;
-		
+
 		strm.zalloc = Z_NULL;
 		strm.zfree  = Z_NULL;
 		strm.opaque = Z_NULL;
@@ -495,12 +495,12 @@ private:
 		if (ret != Z_OK) {
 			return false;
 		}
-		
+
 		for (i = 0; i < count; i++) {
 			strm.avail_in = data[i].size();
 			strm.next_in  = (unsigned char *) data[i].c_str();
 			flush = (i == count - 1) ? Z_FINISH : Z_NO_FLUSH;
-			
+
 			do {
 				strm.avail_out = sizeof(out);
 				strm.next_out  = out;
@@ -512,11 +512,11 @@ private:
 			assert(strm.avail_in == 0);
 		}
 		assert(ret == Z_STREAM_END);
-		
+
 		deflateEnd(&strm);
 		return true;
 	}
-	
+
 public:
 	RemoteSender(const string &gatewayAddress, unsigned short gatewayPort, const string &certificate,
 		const string &proxyAddress)
@@ -541,7 +541,7 @@ public:
 			1024 * 512
 		);
 	}
-	
+
 	~RemoteSender() {
 		Item item;
 		item.exit = true;
@@ -554,7 +554,7 @@ public:
 		thr->join();
 		delete thr;
 	}
-	
+
 	void schedule(const string &unionStationKey, const StaticString &nodeName,
 		const StaticString &category, const StaticString data[],
 		unsigned int count)
@@ -564,13 +564,13 @@ public:
 		item.unionStationKey = unionStationKey;
 		item.nodeName = nodeName;
 		item.category = category;
-		
+
 		if (compress(data, count, item.data)) {
 			item.compressed = true;
 		} else {
 			size_t size = 0;
 			unsigned int i;
-			
+
 			for (i = 0; i < count; i++) {
 				size += data[i].size();
 			}
@@ -579,7 +579,7 @@ public:
 				item.data.append(data[i].c_str(), data[i].size());
 			}
 		}
-		
+
 		P_DEBUG("Scheduling Union Station packet: key=" << unionStationKey <<
 			", node=" << nodeName << ", category=" << category <<
 			", compressedDataSize=" << item.data.size());
@@ -590,7 +590,7 @@ public:
 			packetsDropped++;
 		}
 	}
-	
+
 	unsigned int queued() const {
 		return queue.size();
 	}

data/ext/common/agents/SpawnPreparer.cpp

@@ -73,7 +73,7 @@ setGivenEnvVars(const char *envvarsData) {
 	string envvars = Base64::decode(envvarsData);
 	const char *key = envvars.data();
 	const char *end = envvars.data() + envvars.size();
-	
+
 	while (key < end) {
 		const char *keyEnd = (const char *) memchr(key, '\0', end - key);
 		if (keyEnd != NULL) {
@@ -181,16 +181,16 @@ main(int argc, char *argv[]) {
 		fprintf(stderr, "Too few arguments.\n");
 		exit(1);
 	}
-	
+
 	const char *workingDir = argv[1];
 	const char *envvars = argv[2];
 	const char *executable = argv[3];
 	char **execArgs = &argv[4];
-	
+
 	changeWorkingDir(workingDir);
 	setGivenEnvVars(envvars);
 	dumpInformation();
-	
+
 	// Print a newline just in case whatever executed us printed data
 	// without a newline. Otherwise the next process's "!> I have control"
 	// command will not be properly recognized.