use f-strings for log messages (30b94be8) · Commits · certic / Jama

src/rpc/views.py

+11 −18

Original line number	Diff line number	Diff line
		@@ -198,8 +198,8 @@ def _get_api_key_user_from_request(request: HttpRequest) -> Union[User, None]:
		return User.objects.get(apikey__key_hash=key_hash, apikey__active=True)
		except User.DoesNotExist:
		logger.warning(
		"X-Api-Key was given but user was not found from ip %s",
		request.META.get("REMOTE_ADDR", "unknown"),
		f"X-Api-Key was given but user was not found from ip "
		f"{request.META.get('REMOTE_ADDR', 'unknown')}"
		)
		return None

		@@ -407,9 +407,7 @@ def _restore_deleted_file_if_needed(
		file_instance.title = file_name
		file_instance.original_name = file_name
		file_instance.save()
		logger.info(
		"User {}({}) respawned file {}".format(user.username, user.pk, file_instance.pk)
		)
		logger.info(f"User {user.username}({user.pk}) respawned file {file_instance.pk}")


		def _attach_file_to_origin_collection(
		@@ -428,9 +426,8 @@ def _attach_file_to_origin_collection(
		context.acl,
		)
		logger.info(
		"User {}({}) added file({}) to collection({})".format(
		context.user.username, context.user.pk, file_instance.pk, collection.pk
		)
		f"User {context.user.username}({context.user.pk}) added file({file_instance.pk}) "
		f"to collection({collection.pk})"
		)


		@@ -450,9 +447,8 @@ def _attach_file_to_collection_id(
		context.acl,
		)
		logger.info(
		"User {}({}) added file({}) to collection({})".format(
		context.user.username, context.user.pk, file_instance.pk, collection.pk
		)
		f"User {context.user.username}({context.user.pk}) added file({file_instance.pk}) "
		f"to collection({collection.pk})"
		)


		@@ -568,9 +564,7 @@ def _import_completed_partial_upload(
		)
		_silent_rmdir(partials_dir)
		logger.info(
		"User {}({}) handled file {}".format(
		context.user.username, context.user.pk, file_id
		)
		f"User {context.user.username}({context.user.pk}) handled file {file_id}"
		)
		if upload.collection_id is not None or upload.origin_dir:
		file_instance = models.File.objects.get(id=file_id)
		@@ -691,9 +685,8 @@ def _dispatch_rpc_call(json_data: dict, user: User, methods: dict) -> dict:
		method_params = [user, *params] # always add user to method call
		result = methods[method](*method_params)
		logger.info(
		'User {}({}) called "{}" with params {}'.format(
		user.username, user.pk, method, params
		)
		f"User {user.username} ({user.first_name}, {user.last_name} {user.pk}) "
		f'called "{method}" with params {params}'
		)
		rpc_success_signal.send_robust(
		sender=method, params=[user.username, *params], result=result
		@@ -763,7 +756,7 @@ def rpc(request: HttpRequest) -> HttpResponse:
		logger.warning("RPC batch request exceeded configured item limit")
		return HttpResponse("Payload Too Large", status=413)
		except BadRequestBody as err:
		logger.warning("bad RPC request body: %s", err)
		logger.warning(f"bad RPC request body: {err}")
		return HttpResponse("Bad Request", status=400)
		except ValueError as err:
		logger.warning("client data warning error")