add debug logging for win apache issues

Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 26 matching lines @@
 
 _log = logging.getLogger(__name__)
 
 
 class ApacheHTTP(server_base.ServerBase):
     def __init__(self, port_obj, output_dir, additional_dirs, number_of_servers):
         super(ApacheHTTP, self).__init__(port_obj, output_dir)
         # We use the name "httpd" instead of "apache" to make our paths (e.g. the pid file: /tmp/WebKit/httpd.pid)
         # match old-run-webkit-tests: https://bugs.webkit.org/show_bug.cgi?id=63956
         self._name = 'httpd'
+        self._log_prefixes = ('access_log', 'error_log')

[Dirk Pranke, 2014/07/23 23:21:11]

The fact that this line was missing means that we were never cleaning up old
logs ...

         self._mappings = [{'port': 8000},
                           {'port': 8080},
                           {'port': 8443, 'sslcert': True}]
         self._number_of_servers = number_of_servers
 
         self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
         executable = self._port_obj.path_to_apache()
         server_root = self._filesystem.dirname(self._filesystem.dirname(executable))
 
         test_dir = self._port_obj.layout_tests_dir()
         document_root = self._filesystem.join(test_dir, "http", "tests")
         js_test_resources_dir = self._filesystem.join(test_dir, "resources")
         media_resources_dir = self._filesystem.join(test_dir, "media")
         mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
         cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-httpd.pem")
 
-        access_log = self._filesystem.join(output_dir, "access_log.txt")
-        error_log = self._filesystem.join(output_dir, "error_log.txt")
+        self._access_log = self._filesystem.join(output_dir, "access_log.txt")
+        self._error_log = self._filesystem.join(output_dir, "error_log.txt")
 
         self._is_win = self._port_obj.host.platform.is_win()
 
         start_cmd = [executable,
             '-f', '%s' % self._port_obj.path_to_apache_config_file(),
             '-C', 'ServerRoot "%s"' % server_root,
             '-C', 'DocumentRoot "%s"' % document_root,
             '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,
             '-c', 'Alias /media-resources "%s"' % media_resources_dir,
             '-c', 'TypesConfig "%s"' % mime_types_path,
-            '-c', 'CustomLog "%s" common' % access_log,
-            '-c', 'ErrorLog "%s"' % error_log,
+            '-c', 'CustomLog "%s" common' % self._access_log,
+            '-c', 'ErrorLog "%s"' % self._error_log,
             '-c', 'PidFile %s' % self._pid_file,
             '-c', 'SSLCertificateFile "%s"' % cert_file,
             ]
 
         if self._is_win:
             start_cmd += ['-c', "ThreadsPerChild %d" % (self._number_of_servers * 2)]
         else:
             start_cmd += ['-c', "StartServers %d" % self._number_of_servers,
                           '-c', "MinSpareServers %d" % self._number_of_servers,
                           '-c', "MaxSpareServers %d" % self._number_of_servers,
@@ skipping 30 matching lines @@
                 start_cmd += ['-c', 'Alias %s "%s"' % (alias, path),
                         # Disable CGI handler for additional dirs.
                         '-c', '<Location %s>' % alias,
                         '-c', 'RemoveHandler .cgi .pl',
                         '-c', '</Location>']
 
         self._start_cmd = start_cmd
 
     def _spawn_process(self):
         _log.debug('Starting %s server, cmd="%s"' % (self._name, str(self._start_cmd)))
-        self._process = self._executive.popen(self._start_cmd)
+        self._process = self._executive.popen(self._start_cmd, stderr=self._executive.PIPE)

[Dirk Pranke, 2014/07/23 23:21:11]

This being missing meant that stderr logging was going off into the ether (I
think)

         if self._process.returncode is not None:
             retval = self._process.returncode
             err = self._process.stderr.read()
             if retval or len(err):
                 raise server_base.ServerError('Failed to start %s: %s' % (self._name, err))
 
         # For some reason apache isn't guaranteed to have created the pid file before
         # the process exits, so we wait a little while longer.
         if not self._wait_for_action(lambda: self._filesystem.exists(self._pid_file)):
+            self._dump_logs()
             raise server_base.ServerError('Failed to start %s: no pid file found' % self._name)
 
         return int(self._filesystem.read_text_file(self._pid_file))
 
     def stop(self):
         self._stop_running_server()
 
     def _stop_running_server(self):
         # If apache was forcefully killed, the pid file will not have been deleted, so check
         # that the process specified by the pid_file no longer exists before deleting the file.
@@ skipping 13 matching lines @@
         retval = proc.returncode
         err = proc.stderr.read()
         if retval or len(err):
             raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
 
         # For some reason apache isn't guaranteed to have actually stopped after
         # the stop command returns, so we wait a little while longer for the
         # pid file to be removed.
         if not self._wait_for_action(lambda: not self._filesystem.exists(self._pid_file)):
             raise server_base.ServerError('Failed to stop %s: pid file still exists' % self._name)