diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/pubd.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/rpkid.py | 3 | ||||
| -rw-r--r-- | rpkid/rpki/sql.py | 6 |
3 files changed, 1 insertions, 10 deletions
diff --git a/rpkid/rpki/pubd.py b/rpkid/rpki/pubd.py index 7a00c172..a6d8f83f 100644 --- a/rpkid/rpki/pubd.py +++ b/rpkid/rpki/pubd.py @@ -160,7 +160,6 @@ class main(object): rpki.log.trace() try: - self.sql.ping() self.handler_common(query, None, done, (self.bpki_ta, self.irbe_cert)) except (rpki.async.ExitNow, SystemExit): raise @@ -180,7 +179,6 @@ class main(object): rpki.log.trace() try: - self.sql.ping() match = self.client_url_regexp.search(path) if match is None: raise rpki.exceptions.BadContactURL, "Bad path: %s" % path diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py index f2a10abb..80b0b7cb 100644 --- a/rpkid/rpki/rpkid.py +++ b/rpkid/rpki/rpkid.py @@ -271,7 +271,6 @@ class main(object): cb(200, body = reply) try: - self.sql.ping() q_cms = rpki.left_right.cms_msg(DER = query) q_msg = q_cms.unwrap((self.bpki_ta, self.irbe_cert)) self.irbe_cms_timestamp = q_cms.check_replay(self.irbe_cms_timestamp) @@ -298,7 +297,6 @@ class main(object): cb(200, body = reply) try: - self.sql.ping() match = self.up_down_url_regexp.search(path) if match is None: raise rpki.exceptions.BadContactURL, "Bad URL path received in up_down_handler(): %s" % path @@ -382,7 +380,6 @@ class main(object): """ rpki.log.trace() - self.sql.ping() now = rpki.sundial.now() diff --git a/rpkid/rpki/sql.py b/rpkid/rpki/sql.py index e79993d2..553bea83 100644 --- a/rpkid/rpki/sql.py +++ b/rpkid/rpki/sql.py @@ -78,15 +78,11 @@ class session(object): self.db.close() self.db = None - def ping(self): - rpki.log.debug("Pinging SQL server") - return self.db.ping(True) - def _wrap_execute(self, func, query, args): try: now = rpki.sundial.now() if now > self.timestamp + self.ping_threshold: - self.ping() + self.db.ping(True) self.timestamp = now return func(query, args) except _mysql_exceptions.MySQLError: |