aboutsummaryrefslogtreecommitdiff
path: root/rpkid
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid')
-rw-r--r--rpkid/rpki/https.py2
-rw-r--r--rpkid/rpki/log.py2
-rw-r--r--rpkid/rpki/x509.py4
-rw-r--r--rpkid/tests/smoketest.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py
index 99aebd12..a291f771 100644
--- a/rpkid/rpki/https.py
+++ b/rpkid/rpki/https.py
@@ -663,7 +663,7 @@ class http_server(http_stream):
except POW.SSLErrorSSLError, e:
if "\n" in e:
for line in str(e).splitlines():
- rpki.log.error(line)
+ rpki.log.warn(line)
raise POW.SSLErrorSSLError, "TLS certificate problem, most likely"
else:
raise
diff --git a/rpkid/rpki/log.py b/rpkid/rpki/log.py
index db2fbcbd..8fbf6789 100644
--- a/rpkid/rpki/log.py
+++ b/rpkid/rpki/log.py
@@ -108,4 +108,4 @@ def traceback():
bt = tb.format_exc()
assert bt is not None, "Apparently I'm still not using the right test for null backtrace"
for line in bt.splitlines():
- error(line)
+ warn(line)
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index 5c3cc37f..dcbf3b20 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -1133,9 +1133,9 @@ class XML_CMS_object(CMS_object):
try:
self.schema.assertValid(self.get_content())
except lxml.etree.DocumentInvalid:
- rpki.log.error("PDU failed schema check:")
+ rpki.log.error("PDU failed schema check")
for line in self.pretty_print_content().splitlines():
- rpki.log.error(line)
+ rpki.log.warn(line)
raise
def dump_to_disk(self, prefix):
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index ba171bc4..56c3f40b 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -966,7 +966,7 @@ class allocation(object):
signer = subprocess.Popen(cmd, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
signed = signer.communicate(input = b.pkcs10_request.get_PEM())
if not signed[0]:
- rpki.log.error(signed[1])
+ rpki.log.warn(signed[1])
raise RuntimeError, "Couldn't issue BSC EE certificate"
s.bsc_ee = rpki.x509.X509(PEM = signed[0])
s.bsc_crl = rpki.x509.CRL(PEM_file = s.name + "-SELF.crl")
@@ -1196,7 +1196,7 @@ def call_pubd(pdus, cb):
cb(msg)
def call_pubd_eb(e):
- rpki.log.error("Problem calling pubd: %s" % e)
+ rpki.log.warn("Problem calling pubd: %s" % e)
rpki.log.traceback()
rpki.https.client(