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

Minor fixes. (#502)

Browse Source
This commit is contained in:
kevgliss 2016-11-16 13:23:35 -08:00 committed by GitHub
parent eaf34b1c8b
commit 3f2691c5d4
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lemur/manage.py
View File

@ -858,12 +858,13 @@ class Sources(Command):
Defines a set of actions to take against Lemur's sources.
"""
option_list = (
Option('-s', '--sources', dest='sources', action='append', help='Sources to operate on.'),
Option('-s', '--sources', dest='source_strings', action='append', help='Sources to operate on.'),
Option('-a', '--action', choices=['sync', 'clean'], dest='action', help='Action to take on source.')
)
def run(self, sources, action):
if not sources:
def run(self, source_strings, action):
sources = []
if not source_strings:
table = []
for source in source_service.get_all():
table.append([source.label, source.active, source.description])
@ -871,12 +872,19 @@ class Sources(Command):
sys.stdout.write(tabulate(table, headers=['Label', 'Active', 'Description']))
sys.exit(1)
for label in sources:
source = source_service.get_by_label(label)
elif 'all' in source_strings:
sources = source_service.get_all()
if not source:
sys.stderr.write("Unable to find specified source with label: {0}".format(label))
else:
for source_str in source_strings:
source = source_service.get_by_label(source_str)
if not source:
sys.stderr.write("Unable to find specified source with label: {0}".format(source_str))
sources.append(source)
for source in sources:
if action == 'sync':
self.sync(source)
@ -888,8 +896,10 @@ class Sources(Command):
start_time = time.time()
sys.stdout.write("[+] Staring to sync source: {label}!\n".format(label=source.label))
user = user_service.get_by_username('lemur')
try:
source_service.sync(source)
source_service.sync(source, user)
sys.stdout.write(
"[+] Finished syncing source: {label}. Run Time: {time}\n".format(
label=source.label,
@ -900,10 +910,10 @@ class Sources(Command):
current_app.logger.exception(e)
sys.stdout.write(
"[X] Failed syncing source {label}!\n".format(labe=source.label)
"[X] Failed syncing source {label}!\n".format(label=source.label)
)
metrics.send('{0}_sync_failed'.format(source.label), 'counter', 1)
metrics.send('sync_failed', 'counter', 1, metric_tags={'source': source.label})
@staticmethod
def clean(source):

9
lemur/sources/service.py
View File

@ -151,7 +151,7 @@ def sync_endpoints(source):
_disassociate_endpoints_from_source(endpoints, source)
def sync_certificates(source):
def sync_certificates(source, user):
new, updated = 0, 0
current_app.logger.debug("Retrieving certificates from {0}".format(source.label))
@ -161,6 +161,9 @@ def sync_certificates(source):
for certificate in certificates:
exists = cert_service.find_duplicates(certificate)
certificate['owner'] = user.email
certificate['creator'] = user
if not exists:
certificate_create(certificate, source)
new += 1
@ -180,8 +183,8 @@ def sync_certificates(source):
_disassociate_certs_from_source(certificates, source)
def sync(source):
sync_certificates(source)
def sync(source, user):
sync_certificates(source, user)
sync_endpoints(source)
source.last_run = datetime.datetime.utcnow()