Merge ~xavpaice/charm-nagios:bug/1923407 into charm-nagios:master

[Xav Paice]

[James Troup (elmo)]

Why wrap the chown/chmod in a blanket try? Is there a more specific exception you could catch?

review: Needs Information

[Xav Paice (xavpaice)]

thanks for that - I've updated the commit removing the try/except, following our conversation.

[Celia Wang (ziyiwang)]

LGTM

review: Approve

diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
index ecf4c68..03f0845 100755
--- a/hooks/upgrade_charm.py
+++ b/hooks/upgrade_charm.py
@@ -183,9 +183,10 @@ def enable_livestatus_config():
     missing_packages = fetch.filter_installed_packages(["check-mk-livestatus"])
     if missing_packages:
         fetch.apt_install(missing_packages)
+
+    if not os.path.exists(livestatus_path):
         # This needs a nagios restart to actually make the socket
         host.service_reload("nagios3")
-
     # Fix the perms on the socket
     hookenv.log("Fixing perms on the socket")
     uid = pwd.getpwnam(nagios_user).pw_uid