svn commit: r1195716 - in /trafficserver/traffic/trunk: CHANGES proxy/Main.cc

[amc]

Author: amc
Date: Mon Oct 31 23:13:17 2011
New Revision: 1195716

URL: http://svn.apache.org/viewvc?rev=1195716&view=rev
Log:
TS-984: LogFile::roll crash fix.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/Main.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1195716&r1=1195715&r2=1195716&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Oct 31 23:13:17 2011
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.1
+  *) TS-984 - Log roll crash fixed.
+
   *) TS-997 ATS crashes on remap plugin initialization failure.
    Author: Manjesh Nilange.
 

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1195716&r1=1195715&r2=1195716&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Mon Oct 31 23:13:17 2011
@@ -1637,6 +1637,23 @@ main(int argc, char **argv)
     process_core(core_file);
     _exit(0);
   }
+
+  // We need to do this early so we can initialize the Machine
+  // singleton, which depends on configuration values loaded in this.
+  // We want to initialize Machine as early as possible because it
+  // has other dependencies. Hopefully not in init_HttpProxyServer().
+  init_HttpProxyServer();
+  /* Set up the machine with the outbound address if that's set,
+     or the inbound address if set, otherwise let it default.
+  */
+  sockaddr const* machine_addr = 0;
+  if (ink_inet_is_ip(&HttpConfig::m_master.oride.outgoing_ip_to_bind_saddr)) {
+    machine_addr = &HttpConfig::m_master.oride.outgoing_ip_to_bind_saddr.sa;
+  } else if (ink_inet_is_ip(&HttpConfig::m_master.incoming_ip_to_bind_saddr)) {
+    machine_addr = &HttpConfig::m_master.incoming_ip_to_bind_saddr.sa;
+  }
+  Machine::init(0, machine_addr);
+
   // pmgmt->start() must occur after initialization of Diags but
   // before calling RecProcessInit()
 
@@ -1837,7 +1854,6 @@ main(int argc, char **argv)
     transformProcessor.start();
 #endif
 
-    init_HttpProxyServer();
     if (!http_accept_port_number) {
       TS_ReadConfigInteger(http_accept_port_number, 
"proxy.config.http.server_port");
     }
@@ -1847,17 +1863,6 @@ main(int argc, char **argv)
       return (1);
     }
 
-    /* Set up the machine with the outbound address if that's set,
-       or the inbound address if set, otherwise let it default.
-    */
-    sockaddr const* machine_addr = 0;
-    if (ink_inet_is_ip(&HttpConfig::m_master.oride.outgoing_ip_to_bind_saddr)) 
{
-      machine_addr = &HttpConfig::m_master.oride.outgoing_ip_to_bind_saddr.sa;
-    } else if 
(ink_inet_is_ip(&HttpConfig::m_master.incoming_ip_to_bind_saddr)) {
-      machine_addr = &HttpConfig::m_master.incoming_ip_to_bind_saddr.sa;
-    }
-    Machine::init(0, machine_addr);
-
     int http_enabled = 1;
     TS_ReadConfigInteger(http_enabled, "proxy.config.http.enabled");