diff options
| author | Rob Austein <sra@hactrn.net> | 2009-09-17 21:37:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-09-17 21:37:39 +0000 |
| commit | 0dafad069cbddd52d4640687ac66643841887a6c (patch) | |
| tree | 67026f72601e7fcb9a3d616ca28ecb01b046e447 | |
| parent | 8306a1408cd3cb6be5f11d4c586cb7977da903ab (diff) | |
Don't call .sql_mark_dirty() in roa_obj.__init__(), because we don't
want to save to SQL unless the subsequent .generate() call succeeds.
svn path=/rpkid/rpki/rpki_engine.py; revision=2765
| -rw-r--r-- | rpkid/rpki/rpki_engine.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py index 5f17a912..d07d0e00 100644 --- a/rpkid/rpki/rpki_engine.py +++ b/rpkid/rpki/rpki_engine.py @@ -1151,8 +1151,17 @@ class roa_obj(rpki.sql.sql_persistent): self.asn = asn self.ipv4 = ipv4 self.ipv6 = ipv6 - if self_id or asn or ipv4 or ipv6: - self.sql_mark_dirty() + # + # You might think that we should call self.sql_mark_dirty() here, + # and you'd be right, except that other code kind of assumes that + # this object will not be saved to sql unless the .generate() + # method suceeds. If we never get as far as .generate(), or if + # .generate() fails, we want this roa_obj to softly and silently + # vanish away. + # + # Perhaps I'll figure out a cleaner way to do this some day. + # + #if self_id or asn or ipv4 or ipv6: self.sql_mark_dirty() def update(self, callback, errback): """ |