log: initialize logging earlier

oschaaf · oschaaf · commit 37e1c3618a54 · 2015-12-11T12:02:21.000+01:00
It turns out to be possible to initialize logging earlier by grabbing the log from a global ngx_cycle structure. This makes us start logging earlier, yet loses the "No threading detected ..." messages both from stderr and in error.log when nginx initially starts. With this change, these messages will now be logged as we start logging earlier: " flush . " These originate from SystemCachePath::CacheKey which appends newlines to the key, and the resulting cache key ends up being logged. We might want to change that, because the resulting lines in error.log look weird and might raise questions. Fixes #895
diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc
@@ -983,6 +983,7 @@ void* ps_create_main_conf(ngx_conf_t* cf) {
       "" /* hostname, not used */,
       -1 /* port, not used */);
   active_driver_factory = cfg_m->driver_factory;
+  active_driver_factory->LoggingInit(ngx_cycle->log, false);
   cfg_m->driver_factory->Init();
   ps_set_conf_cleanup_handler(cf, ps_cleanup_main_conf, cfg_m);
   return cfg_m;
@@ -3044,7 +3045,7 @@ ngx_int_t ps_init_module(ngx_cycle_t* cycle) {
       return NGX_ERROR;
     }
 
-    cfg_m->driver_factory->LoggingInit(cycle->log);
+    cfg_m->driver_factory->LoggingInit(cycle->log, true);
     cfg_m->driver_factory->RootInit();
   } else {
     delete cfg_m->driver_factory;
@@ -3076,7 +3077,7 @@ ngx_int_t ps_init_child_process(ngx_cycle_t* cycle) {
 
   // ChildInit() will initialise all ServerContexts, which we need to
   // create ProxyFetchFactories below
-  cfg_m->driver_factory->LoggingInit(cycle->log);
+  cfg_m->driver_factory->LoggingInit(cycle->log, true);
   cfg_m->driver_factory->ChildInit();
 
   ngx_http_core_main_conf_t* cmcf = static_cast<ngx_http_core_main_conf_t*>(
diff --git a/src/ngx_rewrite_driver_factory.cc b/src/ngx_rewrite_driver_factory.cc
@@ -208,10 +208,11 @@ void NgxRewriteDriverFactory::StartThreads() {
   threads_started_ = true;
 }
 
-void NgxRewriteDriverFactory::LoggingInit(ngx_log_t* log) {
+void NgxRewriteDriverFactory::LoggingInit(
+    ngx_log_t* log, bool may_install_crash_handler) {
   log_ = log;
   net_instaweb::log_message_handler::Install(log);
-  if (install_crash_handler()) {
+  if (may_install_crash_handler && install_crash_handler()) {
     NgxMessageHandler::InstallCrashHandler(log);
   }
   ngx_message_handler_->set_log(log);
diff --git a/src/ngx_rewrite_driver_factory.h b/src/ngx_rewrite_driver_factory.h
@@ -115,7 +115,7 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
     return process_script_variables_;
   }
 
-  void LoggingInit(ngx_log_t* log);
+  void LoggingInit(ngx_log_t* log, bool may_install_crash_handler);
 
   virtual void ShutDownMessageHandlers();
 

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,11 @@ void NgxRewriteDriverFactory::StartThreads() {`
`208`	`208`	`threads_started_ = true;`
`209`	`209`	`}`
`210`	`210`
`211`		`-void NgxRewriteDriverFactory::LoggingInit(ngx_log_t* log) {`
	`211`	`+void NgxRewriteDriverFactory::LoggingInit(`
	`212`	`+ ngx_log_t* log, bool may_install_crash_handler) {`
`212`	`213`	`log_ = log;`
`213`	`214`	`net_instaweb::log_message_handler::Install(log);`
`214`		`- if (install_crash_handler()) {`
	`215`	`+ if (may_install_crash_handler && install_crash_handler()) {`
`215`	`216`	`NgxMessageHandler::InstallCrashHandler(log);`
`216`	`217`	`}`
`217`	`218`	`ngx_message_handler_->set_log(log);`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {`
`115`	`115`	`return process_script_variables_;`
`116`	`116`	`}`
`117`	`117`
`118`		`- void LoggingInit(ngx_log_t* log);`
	`118`	`+ void LoggingInit(ngx_log_t* log, bool may_install_crash_handler);`
`119`	`119`
`120`	`120`	`virtual void ShutDownMessageHandlers();`
`121`	`121`