Merge pull request #1339 from codeswhite/patch-systemctl-restart-check

Check if a service is running (Fixed #1337)
StevenBlack · Jul 11, 2020 · c9986cc · c9986cc
2 parents be57b62 + 9e3db93
commit c9986cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/testUpdateHostsFile.py b/testUpdateHostsFile.py
@@ -1324,7 +1324,7 @@ def test_flush_posix_fail(self, *_):
                 self.assertIn(expected, output)
 
     @mock.patch("os.path.isfile", side_effect=[True, False, False, True] + [False] * 10)
-    @mock.patch("subprocess.call", side_effect=[1, 0])
+    @mock.patch("subprocess.call", side_effect=[1, 0, 0])
     def test_flush_posix_fail_then_succeed(self, *_):
         with self.mock_property("platform.system") as obj:
             obj.return_value = "Linux"

diff --git a/updateHostsFile.py b/updateHostsFile.py
@@ -1306,6 +1306,9 @@ def flush_dns_cache():
                 )
 
                 if os.path.isfile(service_file):
+                    if 0 != subprocess.call([systemctl, "status", service],
+                                            stdout=subprocess.DEVNULL):
+                        continue
                     dns_cache_found = True
 
                     if subprocess.call(SUDO + [systemctl, "restart", service]):