Merge pull request #3 from avm/master

Write PID file before initializing Globals.

debian/changelog

@@ -1,3 +1,9 @@
+fastcgi-daemon2 (2.10-14) unstable; urgency=low
+
+  * Write PID file before initializing globals.
+
+ -- Alexander Myltsev <myltsev@yandex-team.ru>  Mon, 24 Sep 2012 12:58:53 +0400
+
 fastcgi-daemon2 (2.10-13) unstable; urgency=low
 
   * Added correct stop for daemon with delay (by ekilimchuk@).

include/details/globals.h

@@ -36,10 +36,10 @@ class RequestsThreadPool;
 
 class Globals : private boost::noncopyable {
 public:
-	Globals(Config *config);
+	Globals(const Config *config);
 	virtual ~Globals();
 
-	Config* config() const;
+	const Config* config() const;
 
 	typedef std::map<std::string, boost::shared_ptr<RequestsThreadPool> > ThreadPoolMap;
 
@@ -59,7 +59,7 @@ class Globals : private boost::noncopyable {
 
 private:
 	ThreadPoolMap pools_;
-	Config* config_;
+	const Config* config_;
 	std::auto_ptr<Loader> loader_;
 	std::auto_ptr<HandlerSet> handlerSet_;
 	std::auto_ptr<ComponentSet> componentSet_;

library/globals.cpp

@@ -18,7 +18,7 @@
 namespace fastcgi
 {
 
-Globals::Globals(Config *config) : config_(config), loader_(new Loader()),
+Globals::Globals(const Config *config) : config_(config), loader_(new Loader()),
 	handlerSet_(new HandlerSet()), componentSet_(new ComponentSet()), logger_(NULL)
 {
 	loader_->init(config);
@@ -58,7 +58,7 @@ Globals::logger() const {
 	return logger_;
 }
 
-Config*
+const Config*
 Globals::config() const {
 	return config_;
 }

main/fcgi_server.cpp

@@ -88,8 +88,6 @@ FCGIServer::start() {
 
 	status_ = LOADING;
 
-	pid(globals_->config()->asString("/fastcgi/daemon/pidfile"));
-
 	logTimes_ = globals_->config()->asInt("/fastcgi/daemon/log-times", 0);
 
 	initMonitorThread();
@@ -372,7 +370,8 @@ FCGIServer::monitor() {
 }
 
 void
-FCGIServer::pid(const std::string &file) {
+FCGIServer::writePid(const Config& config) {
+	const std::string& file = config.asString("/fastcgi/daemon/pidfile");
 	try {
 		std::ofstream f(file.c_str());
 		f.exceptions(std::ios::badbit);

main/fcgi_server.h

@@ -71,6 +71,8 @@ class FCGIServer : public Server {
 public:
 	FCGIServer(boost::shared_ptr<Globals> globals);
 	virtual ~FCGIServer();
+
+	static void writePid(const Config& config);
 	void start();
 	void stop();
 	void join();
@@ -84,8 +86,6 @@ class FCGIServer : public Server {
 
 	std::string getServerInfo() const;
 
-	void pid(const std::string &file);
-
 	void initMonitorThread();
 	void initRequestCache();
 	void initTimeStatistics();

main/main.cpp

@@ -102,7 +102,8 @@ main(int argc, char *argv[]) {
 			}
 		}
 
-		std::auto_ptr<Config> config = Config::create(argc, argv);
+		boost::scoped_ptr<Config> config(Config::create(argc, argv));
+		FCGIServer::writePid(*config);
 		boost::shared_ptr<Globals> globals(new Globals(config.get()));
 		FCGIServer server(globals);
 		::server = &server;