Merge branch 'main' into python-version-update

Author: bjones1

bookserver/internal/feedback.py

@@ -250,7 +250,7 @@ def _platform_edit(
     ext = os.path.splitext(source_path)[1]
     if ext == ".c":
         fmt = '#line 1 "box {}"\n'
-    elif ext == ".s":
+    elif ext == ".s" or ext == ".S":
         # I can't get this to work in the `gnu assembler <https://gcc.gnu.org/onlinedocs/cpp/Line-Control.html>`_. I tried:
         #
         # - From Section 4.11 (Misc directives):

bookserver/routers/books.py

@@ -15,6 +15,7 @@
 import os.path
 import posixpath
 import random
+import socket
 from typing import Optional
 
 # Third-party imports
@@ -304,6 +305,7 @@ async def serve_page(
         show_rs_banner = False
     rslogger.debug(f"After user check rs_banner is {show_rs_banner}")
 
+    worker_name = os.environ.get("WORKER_NAME", socket.gethostname())
     # temporary
     if course_attrs.get("ad_server", "google") == "ethical":
         serve_google_ad = False
@@ -331,6 +333,7 @@ async def serve_page(
         canonical_host=canonical_host,
         show_rs_banner=show_rs_banner,
         show_ethical_ad=serve_ad,
+        worker_name=worker_name,
         **course_attrs,
     )
     # See `templates <https://fastapi.tiangolo.com/advanced/templates/>`_.

bookserver/routers/rslogging.py

@@ -267,7 +267,9 @@ async def updatelastpage(
     RS_info: Optional[str] = Cookie(None),
 ):
     if request_data.last_page_url is None:
-        return  # todo:  log request_data, request.args and request.env.path_info
+        rslogger.error(f"No data for last page url {request_data}")
+        return make_json_response(detail="No Data")
+        # todo:  log request_data, request.args and request.env.path_info
     if request.state.user:
         lpd = request_data.dict()
         rslogger.debug(f"{lpd=}")