Merge ~stub/postgresql-charm:syslog-departed into postgresql-charm:master

[Stuart Bishop]

Fix syslog relation departed hook

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

LGTM

review: Approve

diff --git a/hooks/defaulthook.py b/hooks/defaulthook.py
deleted file mode 100755
index 2e586df..0000000
--- a/hooks/defaulthook.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python3
-
-# Load modules from $JUJU_CHARM_DIR/lib
-import sys
-
-sys.path.append("lib")
-
-from charms.layer import basic
-
-basic.bootstrap_charm_deps()
-basic.init_config_states()
-
-
-# This will load and run the appropriate @hook and other decorated
-# handlers from $JUJU_CHARM_DIR/reactive, $JUJU_CHARM_DIR/hooks/reactive,
-# and $JUJU_CHARM_DIR/hooks/relations.
-#
-# See https://jujucharms.com/docs/stable/authors-charm-building
-# for more information on this pattern.
-from charms.reactive import main
-
-main()
diff --git a/hooks/relations/syslog/provides.py b/hooks/relations/syslog/provides.py
index cad9b6e..4d1ae5b 100644
--- a/hooks/relations/syslog/provides.py
+++ b/hooks/relations/syslog/provides.py
@@ -29,12 +29,12 @@ class SyslogProvides(reactive.relations.RelationBase):
 
     @hook("{provides:syslog}-relation-departed")
     def departed(self):
-        path = self.get_local("path")
-        if os.path.exists(path):
+        path = self._rsyslog_conf_path(hookenv.remote_unit())
+        if path and os.path.exists(path):
             os.remove(path)
             reactive.set_state("syslog.needs_restart")
         self.remove_state("{relation_name}.available")
-        self.depart()
+        self.conversation().depart()
 
     def _rsyslog_conf_path(self, remote_unit):
         # Use both the local unit and remote unit in the config file