Merge pull request #730 from tpng/restart-refactor

Extract restartInProc to its own file

caddy/restart.go

@@ -172,32 +172,3 @@ func getCertsForNewCaddyfile(newCaddyfile Input) error {
 
 	return nil
 }
-
-// restartInProc restarts Caddy forcefully in process using newCaddyfile.
-func restartInProc(newCaddyfile Input) error {
-	wg.Add(1) // barrier so Wait() doesn't unblock
-
-	err := Stop()
-	if err != nil {
-		return err
-	}
-
-	caddyfileMu.Lock()
-	oldCaddyfile := caddyfile
-	caddyfileMu.Unlock()
-
-	err = Start(newCaddyfile)
-	if err != nil {
-		// revert to old Caddyfile
-		if oldErr := Start(oldCaddyfile); oldErr != nil {
-			log.Printf("[ERROR] Restart: in-process restart failed and cannot revert to old Caddyfile: %v", oldErr)
-		} else {
-			wg.Done() // take down our barrier
-		}
-		return err
-	}
-
-	wg.Done() // take down our barrier
-
-	return nil
-}

caddy/restart_windows.go

@@ -7,32 +7,11 @@ import "log"
 func Restart(newCaddyfile Input) error {
 	log.Println("[INFO] Restarting")
 
-	caddyfileMu.Lock()
-	oldCaddyfile := caddyfile
 	if newCaddyfile == nil {
+		caddyfileMu.Lock()
 		newCaddyfile = caddyfile
+		caddyfileMu.Unlock()
 	}
-	caddyfileMu.Unlock()
 
-	wg.Add(1) // barrier so Wait() doesn't unblock
-
-	err := Stop()
-	if err != nil {
-		return err
-	}
-
-	err = Start(newCaddyfile)
-	if err != nil {
-		// revert to old Caddyfile
-		if oldErr := Start(oldCaddyfile); oldErr != nil {
-			log.Printf("[ERROR] Restart: in-process restart failed and cannot revert to old Caddyfile: %v", oldErr)
-		} else {
-			wg.Done() // take down our barrier
-		}
-		return err
-	}
-
-	wg.Done() // take down our barrier
-
-	return nil
+	return restartInProc(newCaddyfile)
 }

caddy/restartinproc.go

+package caddy
+
+import "log"
+
+// restartInProc restarts Caddy forcefully in process using newCaddyfile.
+func restartInProc(newCaddyfile Input) error {
+	wg.Add(1) // barrier so Wait() doesn't unblock
+
+	err := Stop()
+	if err != nil {
+		return err
+	}
+
+	caddyfileMu.Lock()
+	oldCaddyfile := caddyfile
+	caddyfileMu.Unlock()
+
+	err = Start(newCaddyfile)
+	if err != nil {
+		// revert to old Caddyfile
+		if oldErr := Start(oldCaddyfile); oldErr != nil {
+			log.Printf("[ERROR] Restart: in-process restart failed and cannot revert to old Caddyfile: %v", oldErr)
+		} else {
+			wg.Done() // take down our barrier
+		}
+		return err
+	}
+
+	wg.Done() // take down our barrier
+
+	return nil
+}