diff --git a/src/lando/api/legacy/workers/base.py b/src/lando/api/legacy/workers/base.py index 570c1a191..09a7ab4fb 100644 --- a/src/lando/api/legacy/workers/base.py +++ b/src/lando/api/legacy/workers/base.py @@ -180,7 +180,7 @@ def _start(self, max_loops: int | None = None, *args, **kwargs): while self._paused: # Wait a set number of seconds before checking paused variable again. logger.info( - f"Paused, waiting {self.worker_instance.sleep_seconds} seconds..." + f"{self.worker_instance.name} paused, waiting {self.worker_instance.sleep_seconds} seconds..." ) self.throttle(self.worker_instance.sleep_seconds) self.loop(*args, **kwargs) diff --git a/src/lando/api/legacy/workers/landing_worker.py b/src/lando/api/legacy/workers/landing_worker.py index aebd96bba..7379c2aeb 100644 --- a/src/lando/api/legacy/workers/landing_worker.py +++ b/src/lando/api/legacy/workers/landing_worker.py @@ -566,5 +566,5 @@ def bootstrap_repos(self): except Exception as exc: sentry_sdk.capture_exception(exc) logger.warning( - f"Unexpected error `running mach` bootstrap for repo {repo.name}: {exc}" + f"Unexpected error running `mach bootstrap` for repo {repo.name}: {exc}" ) diff --git a/src/lando/dockerflow/decorators.py b/src/lando/dockerflow/decorators.py index eba9d27f2..51c2979de 100644 --- a/src/lando/dockerflow/decorators.py +++ b/src/lando/dockerflow/decorators.py @@ -22,7 +22,7 @@ def _wrapped_view(self, request, *args, **kwargs): # noqa: ANN001 "t": int(1000 * (end_time - start_time)), } - request_logger.info("Request Summary: ", extra=summary) + request_logger.debug("Request Summary: ", extra=summary) return response diff --git a/src/lando/main/logging.py b/src/lando/main/logging.py index be97550d2..b86e285e5 100644 --- a/src/lando/main/logging.py +++ b/src/lando/main/logging.py @@ -70,6 +70,17 @@ def format(self, record: logging.LogRecord) -> str: # (for example, the WSGIRequest object representing the request). Therefore # those values are converted to a string to avoid any issues when serializing. mozlog_record = { + # MozLog https://firefox-source-docs.mozilla.org/mozbase/mozlog.html#data-format + "action": "log", + "time": int(record.created * 1e3), + # We're single-threaded, but might as well report something useful. + "thread": self.hostname, + "pid": record.process, + "source": record.name, + # log action + "level": record.levelname, + "message": record.getMessage(), + # Old format "EnvVersion": self.MOZLOG_ENVVERSION, "Hostname": self.hostname, "Logger": self.mozlog_logger, diff --git a/src/lando/remote_settings.py b/src/lando/remote_settings.py index 3ca741acb..3b7bf91eb 100644 --- a/src/lando/remote_settings.py +++ b/src/lando/remote_settings.py @@ -8,7 +8,11 @@ "BACKEND": "storages.backends.gcloud.GoogleCloudStorage", }, } -STATIC_URL = os.getenv("STATIC_URL") + +# If missing, we default to `STATIC_URL`, from the `from settings import *`. +# This allows the code to run in a local environment configured to simulate a remote +# environment. +STATIC_URL = os.getenv("STATIC_URL", STATIC_URL) # noqa: F405 GS_BUCKET_NAME = os.getenv("GS_BUCKET_NAME") GS_PROJECT_ID = os.getenv("GS_PROJECT_ID") GS_QUERYSTRING_AUTH = False