From 850997b09c9e52d030f05ab66a453042e668006a Mon Sep 17 00:00:00 2001 From: John Anderson Date: Mon, 15 Apr 2019 04:07:52 -0400 Subject: [PATCH] pep8 and postgres backend --- netbox/dcim/urls.py | 2 +- netbox/netbox/settings.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 95b539d8b..88ce12441 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -234,7 +234,7 @@ urlpatterns = [ url(r'^rear-ports/(?P\d+)/connect/(?P[\w-]+)/$', views.CableCreateView.as_view(), name='rearport_connect', kwargs={'termination_a_type': RearPort}), url(r'^rear-ports/(?P\d+)/edit/$', views.RearPortEditView.as_view(), name='rearport_edit'), url(r'^rear-ports/(?P\d+)/delete/$', views.RearPortDeleteView.as_view(), name='rearport_delete'), - url(r'^rear-ports/(?P\d+)/trace/$',cached( views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), + url(r'^rear-ports/(?P\d+)/trace/$', cached(views.CableTraceView.as_view()), name='rearport_trace', kwargs={'model': RearPort}), url(r'^rear-ports/rename/$', cached(views.RearPortBulkRenameView.as_view()), name='rearport_bulk_rename'), url(r'^rear-ports/disconnect/$', views.RearPortBulkDisconnectView.as_view(), name='rearport_bulk_disconnect'), diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 805113a1e..dce7d9cf9 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -118,7 +118,10 @@ else: ] # Database -configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) +if PROMETHEUS_ENABLE: + configuration.DATABASE.update({'ENGINE': 'django_prometheus.db.backends.postgresql'}) +else: + configuration.DATABASE.update({'ENGINE': 'django.db.backends.postgresql'}) DATABASES = { 'default': configuration.DATABASE, }