Skip to content

Commit

Permalink
Merge pull request jupyter-server#302 from Zsailer/cleanup
Browse files Browse the repository at this point in the history
ExtensionHandler logger fallback to default logger
  • Loading branch information
blink1073 authored Sep 3, 2020
2 parents 73cd2b4 + 18ed68f commit 363f3ea
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions jupyter_server/extension/handler.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from urllib.parse import urljoin
from jupyter_server.base.handlers import FileFindHandler
from jinja2.exceptions import TemplateNotFound


class ExtensionHandlerJinjaMixin:
Expand All @@ -8,8 +9,11 @@ class ExtensionHandlerJinjaMixin:
"""
def get_template(self, name):
"""Return the jinja template object for a given name"""
env = '{}_jinja2_env'.format(self.name)
return self.settings[env].get_template(name)
try:
env = '{}_jinja2_env'.format(self.name)
return self.settings[env].get_template(name)
except TemplateNotFound:
return super().get_template(name)


class ExtensionHandlerMixin:
Expand All @@ -36,6 +40,8 @@ def serverapp(self):

@property
def log(self):
if not hasattr(self, 'name'):
return super().log
# Attempt to pull the ExtensionApp's log, otherwise fall back to ServerApp.
try:
return self.extensionapp.log
Expand Down

0 comments on commit 363f3ea

Please sign in to comment.