From 2b85cf0f06b099f9a771e9fbdbdef173c9d04784 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Thu, 13 Apr 2017 09:02:14 -0400
Subject: [PATCH] Just use normal restart for apache

We're now in a systemd world where systemd is managing the restart
effectively, there is no reason to be tricksy with apache now that
we're not working around weird upstartd issues.

Change-Id: Ifadfd504eb10a90db5177ea9180b9cd8331a2948
---
 lib/apache | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/apache b/lib/apache
index f438407aca..e36d0c998f 100644
--- a/lib/apache
+++ b/lib/apache
@@ -173,11 +173,7 @@ function restart_apache_server {
     # Apache can be slow to stop, doing an explicit stop, sleep, start helps
     # to mitigate issues where apache will claim a port it's listening on is
     # still in use and fail to start.
-    time_start "restart_apache_server"
-    stop_service $APACHE_NAME
-    sleep 3
-    start_service $APACHE_NAME
-    time_stop "restart_apache_server"
+    restart_service $APACHE_NAME
 }
 
 # reload_apache_server