Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
format
  • Loading branch information
zffocussss committed Aug 12, 2025
commit 35e26ef8b9f6f241d8eec6313236ff3af0f4d1af
4 changes: 1 addition & 3 deletions granian/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,7 @@ def access_log(t, scope, resp_code):
'scheme': scope['scheme'],
'response_body_length': scope.get('LENGTH', '-'),
}
request_headers = {
key.decode('utf-8'): value.decode('utf-8') for key, value in scope['headers']
}
request_headers = {key.decode('utf-8'): value.decode('utf-8') for key, value in scope['headers']}
atoms.update({'{%s}i' % k: v for k, v in request_headers.items()})
logger(
t,
Expand Down
8 changes: 2 additions & 6 deletions granian/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,14 @@ class LogLevels(str, Enum):
},
}

DEFAULT_ACCESSLOG_FMT = (
'[%(time)s] %(addr)s - "%(method)s %(path)s %(protocol)s" %(status)d %(dt_ms).3f'
)
DEFAULT_ACCESSLOG_FMT = '[%(time)s] %(addr)s - "%(method)s %(path)s %(protocol)s" %(status)d %(dt_ms).3f'

# NOTE: to be consistent with the Rust module logger name
logger = logging.getLogger('_granian')
access_logger = logging.getLogger('granian.access')


def configure_logging(
level: LogLevels, config: Optional[Dict[str, Any]] = None, enabled: bool = True
):
def configure_logging(level: LogLevels, config: Optional[Dict[str, Any]] = None, enabled: bool = True):
log_config = copy.deepcopy(LOGGING_CONFIG)

if config:
Expand Down
11 changes: 2 additions & 9 deletions granian/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ def close(self):
self.inner.close()


def _callback_wrapper(
callback: Callable[..., Any], scope_opts: Dict[str, Any], access_log_fmt=None
):
def _callback_wrapper(callback: Callable[..., Any], scope_opts: Dict[str, Any], access_log_fmt=None):
basic_env: Dict[str, Any] = dict(os.environ)
basic_env.update(
{
Expand Down Expand Up @@ -98,12 +96,7 @@ def access_log(t, scope, resp_code):
'response_body_length': scope['LENGTH'],
}
request_headers = {key: value for key, value in scope.items() if key.startswith('HTTP_')}
atoms.update(
{
'{%s}i' % re.match(r'HTTP_(.*)', k).group(1).lower(): v
for k, v in request_headers.items()
}
)
atoms.update({'{%s}i' % re.match(r'HTTP_(.*)', k).group(1).lower(): v for k, v in request_headers.items()})
logger(
t,
atoms,
Expand Down