Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
from . import views

urlpatterns = [
path('callback/', views.AuthCallback.as_view()),
path('webhook-callback/', views.WebhookCallback.as_view()),
path('oauth-callback/', views.OauthCallback.as_view()),
path("callback/", views.AuthCallback.as_view()),
path("webhook-callback/", views.WebhookCallback.as_view()),
path("oauth-callback/", views.OauthCallback.as_view()),
]


1 change: 0 additions & 1 deletion app/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,3 @@ def get_context_data(self, *args, **kwargs):
context = super(IndexView, self).get_context_data(*args, **kwargs)
context["asd"] = "Message from context"
return context

2 changes: 1 addition & 1 deletion cdoc-doc
Submodule cdoc-doc updated from 24aabc to 17ab41
2 changes: 1 addition & 1 deletion cdoc/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cdoc.settings')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cdoc.settings")

application = get_asgi_application()
31 changes: 24 additions & 7 deletions cdoc/formatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,33 @@


class ExtraFormatter(colorlog.ColoredFormatter):
def_keys = ['name', 'msg', 'args', 'levelname', 'levelno',
'pathname', 'filename', 'module', 'exc_info',
'exc_text', 'stack_info', 'lineno', 'funcName',
'created', 'msecs', 'relativeCreated', 'thread',
'threadName', 'processName', 'process', 'message']
def_keys = [
"name",
"msg",
"args",
"levelname",
"levelno",
"pathname",
"filename",
"module",
"exc_info",
"exc_text",
"stack_info",
"lineno",
"funcName",
"created",
"msecs",
"relativeCreated",
"thread",
"threadName",
"processName",
"process",
"message",
]

def format(self, record):
string = super().format(record)
extra = {k: v for k, v in record.__dict__.items()
if k not in self.def_keys}
extra = {k: v for k, v in record.__dict__.items() if k not in self.def_keys}
if len(extra) > 0:
string += " - extra: " + str(extra)
return string
2 changes: 1 addition & 1 deletion cdoc/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
},
{
"BACKEND": "ftd_django.TemplateBackend",
"DIRS": ["../cdoc-doc"],
"DIRS": ["cdoc-doc"],
},
]

Expand Down
4 changes: 3 additions & 1 deletion cdoc/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
import ftd_django
from django.contrib import admin
from django.urls import path, include
from django.conf import settings
Expand Down Expand Up @@ -54,7 +55,8 @@
TemplateView.as_view(template_name="index.html"),
),
path("ftd/", app_views.IndexView.as_view()),
]
] + ftd_django.static()



def make_v(template, context):
Expand Down
2 changes: 1 addition & 1 deletion cdoc/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

from django.core.wsgi import get_wsgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cdoc.settings')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cdoc.settings")

application = get_wsgi_application()
4 changes: 2 additions & 2 deletions manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

def main():
"""Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'cdoc.settings')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "cdoc.settings")
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
Expand All @@ -18,5 +18,5 @@ def main():
execute_from_command_line(sys.argv)


if __name__ == '__main__':
if __name__ == "__main__":
main()
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ whitenoise
sentry-sdk
rq
django-rq
ftd-django==0.1.0
ftd-django==0.1.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ django-rq==2.5.1
# via -r requirements.in
ftd==0.1.2
# via ftd-django
ftd-django==0.1.0
ftd-django==0.1.1
# via -r requirements.in
ftd-sys==0.1.0
# via ftd
Expand Down