Merge branch 'master' into release

Author: gi0baro

README.md

@@ -1,4 +1,4 @@
-![Emmett](https://deneb.spaces.amira.io/emmett/artwork/logo-bwb-xb-xl.png)
+![Emmett](https://emmett.sh/static/img/logo-bwb-xb-xl.png)
 
 Emmett is a full-stack Python web framework designed with simplicity in mind.
 

docs/debug_and_logging.md

@@ -12,7 +12,7 @@ Debugger
 
 When you run your application with the built-in development server or set your `App.debug` attribute to `True`, Emmett will use its internal debugger when an exception occurs to show you some useful information. What does that look like?
 
-![debugger](https://deneb.spaces.amira.io/emmett/docs/debug.png)
+![debugger](https://emmett.sh/static/screens/debug.png)
 
 The debug page contains three sections:
 
@@ -24,14 +24,14 @@ The difference between the two tracebacks is straightforward: the first is filte
 
 The third section of the debugger page is called *frames* and inspecting it can tell you a lot about what happened during an exception.
 
-![debugger](https://deneb.spaces.amira.io/emmett/docs/debug_frames.png)
+![debugger](https://emmett.sh/static/screens/debug_frames.png)
 
 As you can see, for every step of the full traceback, Emmett collects – when is possible – all the variables' contents and reports them as shown in the above screen.
 
 > – OK, dude. What happens when I have an error in a template?   
 > – *the debugger catches them too.*
 
-![debugger](https://deneb.spaces.amira.io/emmett/docs/debug_template.png)
+![debugger](https://emmett.sh/static/screens/debug_template.png)
 
 The debugger will also try to display the line that generated the exception in templates, complete with the error type. Still, when you forget a `pass` in a template file, it can be impossible to show you the statement that was not *passed*.
 

emmett/__version__.py

@@ -1 +1 @@
-__version__ = "2.5.10"
+__version__ = "2.5.11"

emmett/_reloader.py

@@ -155,6 +155,7 @@ def run_with_reloader(
     port,
     loop='auto',
     log_level=None,
+    log_access=False,
     threads=1,
     threading_mode="workers",
     ssl_certfile: Optional[str] = None,
@@ -177,6 +178,7 @@ def run_with_reloader(
                 kwargs={
                     "loop": loop,
                     "log_level": log_level,
+                    "log_access": log_access,
                     "threads": threads,
                     "threading_mode": threading_mode,
                     "ssl_certfile": ssl_certfile,

emmett/cli.py

@@ -291,6 +291,7 @@ def develop_command(
         port,
         loop=loop,
         log_level='debug',
+        log_access=True,
         threads=1,
         threading_mode="workers",
         ssl_certfile=ssl_certfile,
@@ -326,17 +327,23 @@ def develop_command(
 @click.option(
     '--log-level', type=click.Choice(LOG_LEVELS.keys()), default='info',
     help='Logging level.')
+@click.option(
+    '--access-log/--no-access-log', is_flag=True, default=False,
+    help='Enable access log.')
 @click.option(
     '--backlog', type=int, default=2048,
     help='Maximum number of connections to hold in backlog')
+@click.option(
+    '--backpressure', type=int,
+    help='Maximum number of requests to process concurrently (per worker)')
 @click.option(
     '--ssl-certfile', type=str, default=None, help='SSL certificate file')
 @click.option(
     '--ssl-keyfile', type=str, default=None, help='SSL key file')
 @pass_script_info
 def serve_command(
     info, host, port, workers, threads, threading_mode, interface, ws, loop, opt,
-    log_level, backlog, ssl_certfile, ssl_keyfile
+    log_level, access_log, backlog, backpressure, ssl_certfile, ssl_keyfile
 ):
     app_target = info._get_import_name()
     sgi_run(
@@ -347,10 +354,12 @@ def serve_command(
         loop=loop,
         loop_opt=opt,
         log_level=log_level,
+        log_access=access_log,
         workers=workers,
         threads=threads,
         threading_mode=threading_mode,
         backlog=backlog,
+        backpressure=backpressure,
         enable_websockets=ws,
         ssl_certfile=ssl_certfile,
         ssl_keyfile=ssl_keyfile,

emmett/server.py

@@ -22,10 +22,12 @@ def run(
     loop='auto',
     loop_opt=False,
     log_level=None,
+    log_access=False,
     workers=1,
     threads=1,
     threading_mode='workers',
     backlog=1024,
+    backpressure=None,
     enable_websockets=True,
     ssl_certfile: Optional[str] = None,
     ssl_keyfile: Optional[str] = None
@@ -38,13 +40,14 @@ def run(
         interface=interface,
         workers=workers,
         threads=threads,
-        pthreads=threads,
         threading_mode=threading_mode,
         loop=loop,
         loop_opt=loop_opt,
         websockets=enable_websockets,
         backlog=backlog,
+        backpressure=backpressure,
         log_level=log_level,
+        log_access=log_access,
         ssl_cert=ssl_certfile,
         ssl_key=ssl_keyfile
     )

pyproject.toml

@@ -3,7 +3,7 @@ name = "emmett"
 
 [tool.poetry]
 name = "emmett"
-version = "2.5.10"
+version = "2.5.11"
 description = "The web framework for inventors"
 authors = ["Giovanni Barillari <gi0baro@d4net.org>"]
 license = "BSD-3-Clause"
@@ -47,7 +47,7 @@ emmett = "emmett.cli:main"
 [tool.poetry.dependencies]
 python = "^3.8"
 click = ">=6.0"
-granian = "~1.3.1"
+granian = "~1.4.1"
 emmett-crypto = "^0.6"
 pendulum = "~3.0.0"
 pyDAL = "17.3"