dns/ddclient: stop trying to updat 'None' address

Looks like the type check was off leading to update an empty address. Now instead check first and throw a warning. The condition might be transient but try to hint at the user that the setup is likely broken.
8191 · Aug 22, 2023 · be0ef6b · be0ef6b
1 parent dd58c38
commit be0ef6b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py
@@ -23,6 +23,7 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 """
+import syslog
 import hashlib
 import uuid
 import time
@@ -120,8 +121,13 @@ def execute(self):
             interface = self.settings['interface'] if self.settings.get('interface' ,'').strip() != '' else None
         )
 
-
-        if self._current_address != '' and (
+        if self._current_address == None:
+            syslog.syslog(
+                syslog.LOG_WARNING,
+                "Account %s no global IP address detected, check config if warning persists" % (self.description)
+            )
+            return False
+        elif (
                 self._state.get('ip') is None or
                 self._current_address != self._state.get('ip') or
                 self.state.get('md5') != self.md5

diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/poller.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/poller.py
@@ -145,13 +145,15 @@ def run(self):
             for acc in self._accounts.values():
                 if time.time() - acc.atime > self.poll_interval:
                     if self.is_verbose:
-                        syslog.syslog(syslog.LOG_NOTICE, "Account %s execute" % acc.description)
+                        syslog.syslog(syslog.LOG_NOTICE, "Account %s executing" % acc.description)
                     try:
                         if acc.execute():
                             if self.is_verbose:
-                                syslog.syslog(syslog.LOG_NOTICE, "Account %s changed" % acc.description)
+                                syslog.syslog(syslog.LOG_NOTICE, "Account %s updated" % acc.description)
                             needs_flush = True
                         else:
+                            if self.is_verbose:
+                                syslog.syslog(syslog.LOG_NOTICE, "Account %s not modified" % acc.description)
                             # update last accessed timestamp
                             acc.update_state(None)
                     except Exception as e: