From 043735c35476e1a78322472980eb69693e54d687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andy=20Gru=CC=88ning?= Date: Fri, 20 Sep 2024 13:57:33 +0200 Subject: [PATCH] added log wrappers and included it in Indexer requests --- .../SequencePlugin/Private/Indexer/Indexer.cpp | 14 +++++++++++--- .../Source/SequencePlugin/Private/Util/Log.cpp | 6 ++++++ .../Source/SequencePlugin/Private/Util/Log.h | 13 +++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.cpp create mode 100644 Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.h diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Indexer/Indexer.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Indexer/Indexer.cpp index c4e2c1b5d..7609d408f 100644 --- a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Indexer/Indexer.cpp +++ b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Indexer/Indexer.cpp @@ -6,6 +6,7 @@ #include "Http.h" #include "Util/SequenceSupport.h" #include "HttpManager.h" +#include "Util/Log.h" UIndexer::UIndexer(){} @@ -40,27 +41,34 @@ FString UIndexer::HostName(const int64 ChainID) */ void UIndexer::HTTPPost(const int64& ChainID,const FString& Endpoint,const FString& Args, const TSuccessCallback& OnSuccess, const FFailureCallback& OnFailure) const { - UE_LOG(LogTemp, Display, TEXT("Url: %s"), *this->Url(ChainID,Endpoint)); + const FString Url = *this->Url(ChainID,Endpoint); const TSharedRef HTTP_Post_Req = FHttpModule::Get().CreateRequest(); + + SEQ_LOG_EDITOR(Display, TEXT("POST >> %s with payload %s"), *Url, *Args); HTTP_Post_Req->SetVerb("POST"); HTTP_Post_Req->SetHeader("Content-Type", "application/json");//2 differing headers for the request HTTP_Post_Req->SetHeader("Accept", "application/json"); HTTP_Post_Req->SetTimeout(30); - HTTP_Post_Req->SetURL(this->Url(ChainID, Endpoint)); + HTTP_Post_Req->SetURL(Url); HTTP_Post_Req->SetContentAsString(Args); HTTP_Post_Req->OnProcessRequestComplete().BindLambda([OnSuccess, OnFailure](const FHttpRequestPtr& Request, FHttpResponsePtr Response, const bool bWasSuccessful) { if(bWasSuccessful) { const FString Content = Request->GetResponse()->GetContentAsString(); + SEQ_LOG_EDITOR(Display, TEXT("POST << %d %s (from %s)"), Request->GetResponse()->GetResponseCode(), *Content, *Request->GetURL()); + OnSuccess(Content); } else { if(Request.IsValid() && Request->GetResponse().IsValid()) { - OnFailure(FSequenceError(RequestFail, "Request failed: " + Request->GetResponse()->GetContentAsString())); + const FString Content = Request->GetResponse()->GetContentAsString(); + SEQ_LOG_EDITOR(Error, TEXT("POST << %d %s (from %s)"), Request->GetResponse()->GetResponseCode(), *Content, *Request->GetURL()); + + OnFailure(FSequenceError(RequestFail, "Request failed: " + Content)); } else { diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.cpp new file mode 100644 index 000000000..5ad012182 --- /dev/null +++ b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.cpp @@ -0,0 +1,6 @@ +// Copyright 2024 Horizon Blockchain Games Inc. All rights reserved. + +#include "Log.h" + +DEFINE_LOG_CATEGORY(LogSequence); +DEFINE_LOG_CATEGORY(LogSequenceEditor); diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.h b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.h new file mode 100644 index 000000000..2033bac55 --- /dev/null +++ b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/Log.h @@ -0,0 +1,13 @@ +// Copyright 2024 Horizon Blockchain Games Inc. All rights reserved. +#pragma once + +DECLARE_LOG_CATEGORY_EXTERN(LogSequence, Log, All); +DECLARE_LOG_CATEGORY_EXTERN(LogSequenceEditor, Log, All); + +#define SEQ_LOG(Verbosity, Format, ...) UE_LOG(LogSequence, Verbosity, Format, ##__VA_ARGS__) + +#if WITH_EDITOR +#define SEQ_LOG_EDITOR(Verbosity, Format, ...) UE_LOG(LogSequenceEditor, Verbosity, Format, ##__VA_ARGS__) +#else +#define SEQ_LOG_EDITOR(Verbosity, Format, ...) do {} while (0) +#endif