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

Endpoint sync fixes (#604)

Browse Source
This commit is contained in:
kevgliss
2016-12-15 10:26:59 -08:00
committed by GitHub
parent d20c552248
commit a09faac9a7
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lemur/endpoints/models.py
View File

@ -6,11 +6,14 @@
:license: Apache, see LICENSE for more details.
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
import arrow
from sqlalchemy.orm import relationship
from sqlalchemy import Column, Integer, String, func, DateTime, PassiveDefault, Boolean, ForeignKey
from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.sql.expression import case
from sqlalchemy_utils import ArrowType
from lemur.database import db
from lemur.models import policies_ciphers
@ -64,8 +67,8 @@ class Endpoint(db.Model):
source_id = Column(Integer, ForeignKey('sources.id'))
sensitive = Column(Boolean, default=False)
source = relationship('Source', back_populates='endpoints')
last_updated = Column(DateTime, PassiveDefault(func.now()), onupdate=func.now(), nullable=False)
date_created = Column(DateTime, PassiveDefault(func.now()), nullable=False)
last_updated = Column(ArrowType, default=arrow.utcnow, nullable=False)
date_created = Column(ArrowType, default=arrow.utcnow, onupdate=arrow.utcnow, nullable=False)
@property
def issues(self):

3
lemur/endpoints/service.py
View File

@ -8,6 +8,8 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
import arrow
from flask import current_app
from sqlalchemy import func
@ -95,6 +97,7 @@ def update(endpoint_id, **kwargs):
endpoint.policy = kwargs['policy']
endpoint.certificate = kwargs['certificate']
endpoint.source = kwargs['source']
endpoint.last_updated = arrow.utcnow()
metrics.send('endpoint_updated', 'counter', 1, metric_tags={'source': endpoint.source.label})
database.update(endpoint)
return endpoint