enh: properly check for nginx status before attempting to reload

CHANGELOG

@@ -1,3 +1,5 @@
+0.9.5
+ - enh: properly check for nginx status before attempting to reload
 0.9.4
  - maintenance release
 0.9.3

dcor_control/cli/inspect.py

@@ -1,5 +1,3 @@
-import subprocess as sp
-
 import click
 from dcor_shared import paths
 
@@ -59,8 +57,7 @@ def inspect(assume_yes=False):
 
     inspect_mod.reload_supervisord()
 
-    click.secho("Reloading nginx...", bold=True)
-    sp.check_output("systemctl reload nginx", shell=True)
+    inspect_mod.reload_nginx()
 
     # ask the user whether to search for orphaned files
     if assume_yes or click.confirm('Perform search for orphaned files?'):

dcor_control/inspect/__init__.py

@@ -8,6 +8,10 @@
     check_ckan_uploader_patch_to_support_symlinks,
 )
 from .config_nginx import check_nginx
-from .config_supervisord import check_supervisord, reload_supervisord
+from .config_supervisord import (
+    check_supervisord,
+    reload_supervisord,
+    reload_nginx,
+)
 from .config_uwsgi import check_uwsgi
 from .data_ckan import check_orphaned_files

dcor_control/inspect/config_supervisord.py

@@ -28,6 +28,16 @@ def check_supervisord(autocorrect):
                 wpath.write_text(data)
 
 
+def is_nginx_running():
+    """Simple check for whether supervisord is running"""
+    try:
+        sp.check_output("sudo systemctl status nginx", shell=True)
+    except sp.CalledProcessError:
+        return False
+    else:
+        return True
+
+
 def is_supervisord_running():
     """Simple check for whether supervisord is running"""
     try:
@@ -38,6 +48,15 @@ def is_supervisord_running():
         return True
 
 
+def reload_nginx():
+    if is_nginx_running():
+        click.secho("Reloading nginx...", bold=True)
+        sp.check_output("sudo systemctl reload nginx", shell=True)
+    else:
+        click.secho("Not reloading nginx (not running)...",
+                    bold=True, fg="red")
+
+
 def reload_supervisord():
     if is_supervisord_running():
         click.secho("Reloading CKAN...", bold=True)