Fix 'occurred' typo

[bpdyndnsd] / src / updater.cpp

diff --git a/src/updater.cpp b/src/updater.cpp
index 875e03d..7c3b021 100644 (file)
--- a/src/updater.cpp
+++ b/src/updater.cpp
@@ -19,6 +19,11 @@
 using namespace std;
 
 
+/// Server error threshold: When the host IP is not current, the DNS TTL expired
+/// and we already sent an update.
+const int ServerErrorTTLExpiredThreshold = 15 * 60;
+
+
 /**
  * Default constructor which initializes the member Conf.
  */
@@ -210,6 +215,8 @@ void Updater::init_log_facility() const
 {
     Log->set_log_facility(Conf->get_loglevel(),Conf->get_syslog(),Conf->get_external_warning_log(),Conf->get_external_warning_level(),Conf->get_external_log_only_once());
     Log->print_init_log_facility();
+
+    Log->set_log_passwords(Conf->get_log_passwords());
 }
 
 
@@ -223,7 +230,7 @@ void Updater::update_services(bool changed_to_online) const
     list<Service::Ptr> services = ServiceHolder->get_services();
 
     // Get the actual IP of this host.
-    string ip_host = IPAddrHelp->get_actual_ip(Conf->get_webcheck_enabled(), changed_to_online);
+    string ip_host = IPAddrHelp->get_actual_ip(Conf->get_webcheck_enabled(), changed_to_online, Conf->get_wan_ip_override());
     if ( ip_host.empty() )
     {
         Log->print_no_wan_ip(changed_to_online);
@@ -237,12 +244,10 @@ void Updater::update_services(bool changed_to_online) const
     {
         string ip_last_update = service->get_actual_ip();
         string hostname = service->get_hostname();
-        time_t lastupdated = 0;
         time_t current_time = time(NULL);
 
-        // Try to get the lastupdated time of the actual service if there is one.
-        if ( !service->get_last_updates().empty() )
-            lastupdated = service->get_last_updates().front(); /*lint !e1793 */
+        // Get the last update time of the service.
+        time_t lastupdated = service->get_last_update_time();
 
         Log->print_check_service_update(hostname, current_time, lastupdated);
 
@@ -252,7 +257,8 @@ void Updater::update_services(bool changed_to_online) const
         Log->print_cached_dns_entry(hostname, ip_dns_recheck, ip_last_update, ip_host);
 
         // Test if the DNS-Record could not be found.
-        if ( ip_dns_recheck.empty() )
+        // If DNS-Record was not found but service was not activated, the hostname could be deactivated, offline or not existent. In this case try a ordinary update.
+        if ( ip_dns_recheck.empty() && service->get_activated() )
         {
             Log->print_dns_lookup_failed(changed_to_online, hostname);
             continue;
@@ -270,18 +276,33 @@ void Updater::update_services(bool changed_to_online) const
         if ( ip_last_update != ip_host )
         {
             // Update
-            Log->print_update_service(hostname, ip_dns_recheck, ip_last_update, ip_host, lastupdated);
-            service->update(ip_host,current_time);
+            if ( !ip_dns_recheck.empty() )
+            {
+                Log->print_update_service(hostname, ip_dns_recheck, ip_last_update, ip_host, lastupdated);
+            }
+            else
+            {
+                // Service gets updated the first time and no DNS-Record was found. This is either a initial update or the hostname is really not available.
+                Log->print_update_service(hostname, "<NO IP SET>", ip_last_update, ip_host, lastupdated);
+            }
+
+            service->update(ip_host, current_time, changed_to_online);
         }
         else
         {
             int dns_cache_ttl = service->get_dns_cache_ttl();
+
+            // Add server error threshold so we don't jam the server with updates for the same IP
+            // in case the server doesn't hand out the already sent IP via DNS
+            // (might indicate a server error).
+            dns_cache_ttl += ServerErrorTTLExpiredThreshold;
+
             // Check if DNS Cache TTL is expired, if so, then update the same IP again.
             if ( (lastupdated + dns_cache_ttl) < current_time )
             {
                 // Update
                 Log->print_update_service_ttl_expired(hostname, ip_dns_recheck, ip_last_update, ip_host, lastupdated, dns_cache_ttl, current_time);
-                service->update(ip_host,current_time);
+                service->update(ip_host, current_time, changed_to_online);
             }
             else
             {