Submitted by Dirk Wagner on May 11, 2017, 10:16 a.m.

Details

Message ID 1494497813-2694-1-git-send-email-dirk.wagner@ipfire.org
State New
Headers show

Commit Message

Dirk Wagner May 11, 2017, 10:16 a.m.
One issue remains:
The constant holdoff_rate_limited_minutes should be overwritable for each provider. For DomainOffensive 30 min ist too short.

From 312ca7b32852c8b950868423d1919bc2f25031aa Mon Sep 17 00:00:00 2001
From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Thu, 11 May 2017 09:04:49 +0200
Subject: [PATCH] ddns: fixed compile errors

Signed-off-by: Dirk Wagner <dirk.wagner@ipfire.org>
---
 src/ddns/providers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index cb6dd2d..5386f35 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -69,7 +69,7 @@  class DDNSProvider(object):
 
 	# holdoff time for rate-limited updates - Number of minutes no update
 	# is tried after the last one has been sent.
-	holdoff_rate-limited_minutes = 30
+	holdoff_rate_limited_minutes = 30
 
 	# True if the provider is able to remove records, too.
 	# Required to remove AAAA records if IPv6 is absent again.
@@ -248,10 +248,10 @@  class DDNSProvider(object):
 		last_update = self.db.last_update(self.hostname, status=last_status)
 
 		# Calculate holdoff end, based on the last status (failure or rate-limited)
-		if last_status == "failure"
+		if last_status == "failure":
 			holdoff_end = last_update + datetime.timedelta(days=self.holdoff_failure_days)
 		else:
-			holdoff_end = last_update + datetime.timedelta(minutes=self.holdoff_rate-limited_minutes)
+			holdoff_end = last_update + datetime.timedelta(minutes=self.holdoff_rate_limited_minutes)
 
 		now = datetime.datetime.utcnow()
 		if now < holdoff_end:

Comments

Dirk Wagner May 11, 2017, 10:23 a.m.
Sorry for the empty Subject, parts of the mail are lost.

The patch is for the status-defeated branch

> ---------- Ursprüngliche Nachricht ----------
> Von: Dirk Wagner <dirk.wagner@ipfire.org>
> An: ddns@lists.ipfire.org
> Cc: Dirk Wagner <dirk.wagner@ipfire.org>
> Datum: 11. Mai 2017 um 12:16
> Betreff: 
> 
> One issue remains:
> The constant holdoff_rate_limited_minutes should be overwritable for each provider. For DomainOffensive 30 min ist too short.
> 
> From 312ca7b32852c8b950868423d1919bc2f25031aa Mon Sep 17 00:00:00 2001
> From: Dirk Wagner <dirk.wagner@ipfire.org>
> Date: Thu, 11 May 2017 09:04:49 +0200
> Subject: [PATCH] ddns: fixed compile errors
> 
> Signed-off-by: Dirk Wagner <dirk.wagner@ipfire.org>
> ---
>  src/ddns/providers.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
> index cb6dd2d..5386f35 100644
> --- a/src/ddns/providers.py
> +++ b/src/ddns/providers.py
> @@ -69,7 +69,7 @@ class DDNSProvider(object):
>  
>  	# holdoff time for rate-limited updates - Number of minutes no update
>  	# is tried after the last one has been sent.
> -	holdoff_rate-limited_minutes = 30
> +	holdoff_rate_limited_minutes = 30
>  
>  	# True if the provider is able to remove records, too.
>  	# Required to remove AAAA records if IPv6 is absent again.
> @@ -248,10 +248,10 @@ class DDNSProvider(object):
>  		last_update = self.db.last_update(self.hostname, status=last_status)
>  
>  		# Calculate holdoff end, based on the last status (failure or rate-limited)
> -		if last_status == "failure"
> +		if last_status == "failure":
>  			holdoff_end = last_update + datetime.timedelta(days=self.holdoff_failure_days)
>  		else:
> -			holdoff_end = last_update + datetime.timedelta(minutes=self.holdoff_rate-limited_minutes)
> +			holdoff_end = last_update + datetime.timedelta(minutes=self.holdoff_rate_limited_minutes)
>  
>  		now = datetime.datetime.utcnow()
>  		if now < holdoff_end:
> -- 
> 2.1.4
>
Michael Tremer May 24, 2017, 2:43 p.m.
Hello,

@Stefan: Could you please review these patches more swiftly? There are so many
things open and lying around regarding ddns which I would like to see solved.

No need to rush things, but at least I would like to see things moving forward.

Best,
-Michael

On Thu, 2017-05-11 at 12:23 +0200, dirk.wagner@ipfire.org wrote:
> Sorry for the empty Subject, parts of the mail are lost.
> 
> The patch is for the status-defeated branch
> 
> > ---------- Ursprüngliche Nachricht ----------
> > Von: Dirk Wagner <dirk.wagner@ipfire.org>
> > An: ddns@lists.ipfire.org
> > Cc: Dirk Wagner <dirk.wagner@ipfire.org>
> > Datum: 11. Mai 2017 um 12:16
> > Betreff: 
> > 
> > One issue remains:
> > The constant holdoff_rate_limited_minutes should be overwritable for each
> > provider. For DomainOffensive 30 min ist too short.
> > 
> > From 312ca7b32852c8b950868423d1919bc2f25031aa Mon Sep 17 00:00:00 2001
> > From: Dirk Wagner <dirk.wagner@ipfire.org>
> > Date: Thu, 11 May 2017 09:04:49 +0200
> > Subject: [PATCH] ddns: fixed compile errors
> > 
> > Signed-off-by: Dirk Wagner <dirk.wagner@ipfire.org>
> > ---
> >  src/ddns/providers.py | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/ddns/providers.py b/src/ddns/providers.py
> > index cb6dd2d..5386f35 100644
> > --- a/src/ddns/providers.py
> > +++ b/src/ddns/providers.py
> > @@ -69,7 +69,7 @@ class DDNSProvider(object):
> >  
> >  	# holdoff time for rate-limited updates - Number of minutes no
> > update
> >  	# is tried after the last one has been sent.
> > -	holdoff_rate-limited_minutes = 30
> > +	holdoff_rate_limited_minutes = 30
> >  
> >  	# True if the provider is able to remove records, too.
> >  	# Required to remove AAAA records if IPv6 is absent again.
> > @@ -248,10 +248,10 @@ class DDNSProvider(object):
> >  		last_update = self.db.last_update(self.hostname,
> > status=last_status)
> >  
> >  		# Calculate holdoff end, based on the last status (failure
> > or rate-limited)
> > -		if last_status == "failure"
> > +		if last_status == "failure":
> >  			holdoff_end = last_update +
> > datetime.timedelta(days=self.holdoff_failure_days)
> >  		else:
> > -			holdoff_end = last_update +
> > datetime.timedelta(minutes=self.holdoff_rate-limited_minutes)
> > +			holdoff_end = last_update +
> > datetime.timedelta(minutes=self.holdoff_rate_limited_minutes)
> >  
> >  		now = datetime.datetime.utcnow()
> >  		if now < holdoff_end:
> > -- 
> > 2.1.4
> > 
> 
> _______________________________________________
> ddns mailing list
> ddns@lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/ddns
Dirk Wagner Aug. 17, 2017, 8:26 a.m.
Any new on that?

> Michael Tremer hat am 24. Mai 2017 um 16:43 geschrieben:
> 
> 
>     Hello,
> 
>     @Stefan: Could you please review these patches more swiftly? There are so many
>     things open and lying around regarding ddns which I would like to see solved.
> 
>     No need to rush things, but at least I would like to see things moving forward.
> 
>     Best,
>     -Michael
> 
>     On Thu, 2017-05-11 at 12:23 +0200, dirk.wagner@ipfire.org mailto:dirk.wagner@ipfire.org wrote:
> 
>         > > Sorry for the empty Subject, parts of the mail are lost.
> > 
> >         The patch is for the status-defeated branch
> > 
> >             > -------- Ursprüngliche Nachricht ----------
>             Von: Dirk Wagner
>             An: ddns@lists.ipfire mailto:ddns@lists.ipfire .org
>             Cc: Dirk Wagner
>             Datum: 11. Mai 2017 um 12:16
>             Betreff:
> 
>             One issue remains:
>             The constant holdoff_rate_limited_minutes should be overwritable for each
>             provider. For DomainOffensive 30 min ist too short.
> 
>             From 312ca7b32852c8b950868423d1919bc2f25031aa Mon Sep 17 00:00:00 2001
>             From: Dirk Wagner
>             Date: Thu, 11 May 2017 09:04:49 +0200
>             Subject: [PATCH] ddns: fixed compile errors
> 
>             Signed-off-by: Dirk Wagner
>             ---
>             src/ddns/providers.py | 6 +++---
>             1 file changed, 3 insertions(+), 3 deletions(-)
> 
>             diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>             index cb6dd2d..5386f35 100644
>             --- a/src/ddns/providers.py
>             +++ b/src/ddns/providers.py
>             @@ -69,7 +69,7 @@ class DDNSProvider(object):
> 
>             # holdoff time for rate-limited updates - Number of minutes no
>             update
>             # is tried after the last one has been sent.
>             - holdoff_rate-limited_minutes = 30
>             + holdoff_rate_limited_minutes = 30
> 
>             # True if the provider is able to remove records, too.
>             # Required to remove AAAA records if IPv6 is absent again.
>             @@ -248,10 +248,10 @@ class DDNSProvider(object):
>             last_update = self.db.last_update(self.hostname,
>             status=last_status)
> 
>             # Calculate holdoff end, based on the last status (failure
>             or rate-limited)
>             - if last_status == "failure"
>             + if last_status == "failure":
>             holdoff_end = last_update +
>             datetime.timedelta(days=self.holdoff_failure_days)
>             else:
>             - holdoff_end = last_update +
>             datetime.timedelta(minutes=self.holdoff_rate-limited_minutes)
>             + holdoff_end = last_update +
>             datetime.timedelta(minutes=self.holdoff_rate_limited_minutes)
> 
>             now = datetime.datetime.utcnow()
>             if now < holdoff_end:
>             --
>             2.1.4
> 
>         _______________________________________________
ddns mailing list
ddns@lists.ipfire mailto:ddns@lists.ipfire .org
http://lists.ipfire.org/mailman/listinfo/ddns