merge fixes
This commit is contained in:
parent
522b0a123e
commit
5209ece1cd
@ -49,7 +49,7 @@ logging.basicConfig(format='[{levelname:^7}] [{module:^15}] {message}', style='{
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
logger.setLevel(LOG_LEVEL)
|
logger.setLevel(LOG_LEVEL)
|
||||||
logging.getLogger('util').setLevel(LOG_LEVEL)
|
logging.getLogger('util').setLevel(LOG_LEVEL)
|
||||||
logging.getLogger('NV').setLevel(LOG_LEVEL)
|
logging.getLogger('DriverMatrix').setLevel(LOG_LEVEL)
|
||||||
|
|
||||||
|
|
||||||
# FastAPI
|
# FastAPI
|
||||||
|
@ -11,7 +11,7 @@ from sqlalchemy.engine import Engine
|
|||||||
from sqlalchemy.orm import sessionmaker, declarative_base, Session, relationship
|
from sqlalchemy.orm import sessionmaker, declarative_base, Session, relationship
|
||||||
from sqlalchemy.schema import CreateTable
|
from sqlalchemy.schema import CreateTable
|
||||||
|
|
||||||
from util import NV, PrivateKey, PublicKey
|
from util import DriverMatrix, PrivateKey, PublicKey, DriverMatrix
|
||||||
|
|
||||||
logging.basicConfig()
|
logging.basicConfig()
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -148,7 +148,7 @@ class Origin(Base):
|
|||||||
return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})'
|
return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})'
|
||||||
|
|
||||||
def serialize(self) -> dict:
|
def serialize(self) -> dict:
|
||||||
_ = NV().find(self.guest_driver_version)
|
_ = DriverMatrix().find(self.guest_driver_version)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'origin_ref': self.origin_ref,
|
'origin_ref': self.origin_ref,
|
||||||
|
@ -104,7 +104,7 @@ class DriverMatrix:
|
|||||||
self.log.debug(f'Successfully loaded "{DriverMatrix.__DRIVER_MATRIX_FILENAME}".')
|
self.log.debug(f'Successfully loaded "{DriverMatrix.__DRIVER_MATRIX_FILENAME}".')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
DriverMatrix.__DRIVER_MATRIX = {} # init empty dict to not try open file everytime, just when restarting app
|
DriverMatrix.__DRIVER_MATRIX = {} # init empty dict to not try open file everytime, just when restarting app
|
||||||
# self.log.warning(f'Failed to load "{NV.__DRIVER_MATRIX_FILENAME}": {e}')
|
# self.log.warning(f'Failed to load "{DriverMatrix.__DRIVER_MATRIX_FILENAME}": {e}')
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def find(version: str) -> dict | None:
|
def find(version: str) -> dict | None:
|
||||||
|
Loading…
Reference in New Issue
Block a user