Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change ordering in more places

This commit is contained in:
Curtis Castrapel 2019-05-15 11:47:53 -07:00
parent 7e92edc70a
commit 26d10e8b98
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lemur/pending_certificates/cli.py
View File

@ -42,11 +42,11 @@ def fetch(ids):
final_cert = pending_certificate_service.create_certificate(cert, real_cert, cert.user) final_cert = pending_certificate_service.create_certificate(cert, real_cert, cert.user)
pending_certificate_service.update( pending_certificate_service.update(
cert.id, cert.id,
resolved=True resolved_cert_id=final_cert.id
) )
pending_certificate_service.update( pending_certificate_service.update(
cert.id, cert.id,
resolved_cert_id=final_cert.id resolved=True
) )
# add metrics to metrics extension # add metrics to metrics extension
new += 1 new += 1
@ -100,11 +100,11 @@ def fetch_all_acme():
final_cert = pending_certificate_service.create_certificate(pending_cert, real_cert, pending_cert.user) final_cert = pending_certificate_service.create_certificate(pending_cert, real_cert, pending_cert.user)
pending_certificate_service.update( pending_certificate_service.update(
pending_cert.id, pending_cert.id,
resolved=True resolved_cert_id=final_cert.id
) )
pending_certificate_service.update( pending_certificate_service.update(
pending_cert.id, pending_cert.id,
resolved_cert_id=final_cert.id resolved=True
) )
# add metrics to metrics extension # add metrics to metrics extension
new += 1 new += 1

8
lemur/pending_certificates/service.py
View File

@ -259,13 +259,13 @@ def upload(pending_certificate_id, **kwargs):
final_cert = create_certificate(pending_cert, partial_cert, pending_cert.user) final_cert = create_certificate(pending_cert, partial_cert, pending_cert.user)
update(
pending_cert.id,
resolved=True
)
pending_cert_final_result = update( pending_cert_final_result = update(
pending_cert.id, pending_cert.id,
resolved_cert_id=final_cert.id resolved_cert_id=final_cert.id
) )
update(
pending_cert.id,
resolved=True
)
return pending_cert_final_result return pending_cert_final_result