Skip to content

Commit bdfbdff

Browse files
andygrueningandygruening
committed
changed to SEQ_LOG in marketplace and checkout source code
1 parent e5556f9 commit bdfbdff

2 files changed

Lines changed: 24 additions & 28 deletions

File tree

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/Checkout/SequenceCheckout.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void USequenceCheckout::HTTPPost(const int64& TargetChainID, const FString& Endp
4141
const FString AccessKey = UConfigFetcher::GetConfigVar("ProjectAccessKey");
4242
if (AccessKey.IsEmpty())
4343
{
44-
UE_LOG(LogTemp, Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
44+
SEQ_LOG(Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
4545
return;
4646
}
4747

@@ -71,20 +71,20 @@ void USequenceCheckout::HTTPPost(const int64& TargetChainID, const FString& Endp
7171
if (bWasSuccessful)
7272
{
7373
const FString Content = Response->GetContentAsString();
74-
UE_LOG(LogTemp, Display, TEXT("Response: %s"), *Content);
74+
SEQ_LOG(Display, TEXT("Response: %s"), *Content);
7575
OnSuccess(Content);
7676
}
7777
else
7878
{
7979
if (Request.IsValid() && Response.IsValid())
8080
{
8181
const FString ErrorMessage = Response->GetContentAsString();
82-
UE_LOG(LogTemp, Error, TEXT("Request failed: %s"), *ErrorMessage);
82+
SEQ_LOG(Error, TEXT("Request failed: %s"), *ErrorMessage);
8383
OnFailure(FSequenceError(RequestFail, "Request failed: " + ErrorMessage));
8484
}
8585
else
8686
{
87-
UE_LOG(LogTemp, Error, TEXT("Request failed: Invalid Request Pointer"));
87+
SEQ_LOG(Error, TEXT("Request failed: Invalid Request Pointer"));
8888
OnFailure(FSequenceError(RequestFail, "Request failed: Invalid Request Pointer"));
8989
}
9090
}
@@ -105,7 +105,7 @@ template < typename T> FString USequenceCheckout::BuildArgs(T StructIn) const
105105
{
106106
if (!FJsonObjectConverter::UStructToJsonObjectString<T>(StructIn, Result))
107107
{
108-
UE_LOG(LogTemp, Display, TEXT("Failed to convert specified UStruct to a json object\n"));
108+
SEQ_LOG(Display, TEXT("Failed to convert specified UStruct to a json object\n"));
109109
}
110110
}
111111
return Result;
@@ -121,7 +121,7 @@ template<typename T> T USequenceCheckout::BuildResponse(const FString Text) cons
121121

122122
if (!FJsonSerializer::Deserialize(TJsonReaderFactory<>::Create(Text), JSON_Step))
123123
{
124-
UE_LOG(LogTemp, Display, TEXT("Failed to convert String: %s to Json object"), *Text);
124+
SEQ_LOG(Display, TEXT("Failed to convert String: %s to Json object"), *Text);
125125
return T();
126126
}
127127
//this next line with throw an exception in null is used as an entry in json attributes! we need to remove null entries
@@ -133,7 +133,7 @@ template<typename T> T USequenceCheckout::BuildResponse(const FString Text) cons
133133
{//use unreal parsing!
134134
if (!FJsonObjectConverter::JsonObjectToUStruct<T>(JSON_Step.ToSharedRef(), &Ret_Struct))
135135
{
136-
UE_LOG(LogTemp, Display, TEXT("Failed to convert Json Object: %s to USTRUCT of type T"), *Text);
136+
SEQ_LOG(Display, TEXT("Failed to convert Json Object: %s to USTRUCT of type T"), *Text);
137137
return T();
138138
}
139139
}
@@ -146,7 +146,7 @@ void USequenceCheckout::GetCheckoutOptions(const int64 ChainID, const FString& W
146146
{
147147
if (Orders.IsEmpty())
148148
{
149-
UE_LOG(LogTemp, Error, TEXT("Orders is empty"));
149+
SEQ_LOG(Error, TEXT("Orders is empty"));
150150
return;
151151
}
152152

‎Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void USequenceMarketplace::HTTPPost(const int64& ChainID, const FString& Endpoin
5454
FString AccessKey = UConfigFetcher::GetConfigVar("ProjectAccessKey");
5555
if (AccessKey.IsEmpty())
5656
{
57-
UE_LOG(LogTemp, Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
57+
SEQ_LOG(Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
5858
return;
5959
}
6060

@@ -76,28 +76,27 @@ void USequenceMarketplace::HTTPPost(const int64& ChainID, const FString& Endpoin
7676
*FString(UTF8_TO_TCHAR(HTTP_Post_Req->GetContent().GetData())).Replace(TEXT("\""), TEXT("\\\""))
7777
);
7878

79-
SEQ_LOG_EDITOR(Log, TEXT("%s"), *CurlCommand);
80-
79+
SEQ_LOG_EDITOR(Display, TEXT("%s"), *CurlCommand);
8180

8281
HTTP_Post_Req->OnProcessRequestComplete().BindLambda([OnSuccess, OnFailure](const FHttpRequestPtr& Request, FHttpResponsePtr Response, const bool bWasSuccessful)
8382
{
8483
if (bWasSuccessful)
8584
{
8685
const FString Content = Response->GetContentAsString();
87-
UE_LOG(LogTemp, Display, TEXT("Response: %s"), *Content);
86+
SEQ_LOG(Display, TEXT("Response: %s"), *Content);
8887
OnSuccess(Content);
8988
}
9089
else
9190
{
9291
if (Request.IsValid() && Response.IsValid())
9392
{
9493
const FString ErrorMessage = Response->GetContentAsString();
95-
UE_LOG(LogTemp, Error, TEXT("Request failed: %s"), *ErrorMessage);
94+
SEQ_LOG(Error, TEXT("Request failed: %s"), *ErrorMessage);
9695
OnFailure(FSequenceError(RequestFail, "Request failed: " + ErrorMessage));
9796
}
9897
else
9998
{
100-
UE_LOG(LogTemp, Error, TEXT("Request failed: Invalid Request Pointer"));
99+
SEQ_LOG(Error, TEXT("Request failed: Invalid Request Pointer"));
101100
OnFailure(FSequenceError(RequestFail, "Request failed: Invalid Request Pointer"));
102101
}
103102
}
@@ -111,49 +110,46 @@ void USequenceMarketplace::HTTPPostSwapAPI(const FString& Endpoint, const FStrin
111110
const TSuccessCallback<FString>& OnSuccess, const FFailureCallback& OnFailure) const
112111
{
113112
const FString RequestURL = "https://api.sequence.app/rpc/API/" + Endpoint;
114-
115113
const TSharedRef<IHttpRequest> HTTP_Post_Req = FHttpModule::Get().CreateRequest();
116114

117115
FString AccessKey = UConfigFetcher::GetConfigVar("ProjectAccessKey");
118116
if (AccessKey.IsEmpty())
119117
{
120-
UE_LOG(LogTemp, Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
118+
SEQ_LOG(Error, TEXT("AccessKey is empty! Failed to set HTTP header."));
121119
return;
122120
}
123121

124122
HTTP_Post_Req->SetVerb("POST");
125123
HTTP_Post_Req->SetHeader(TEXT("Content-Type"), TEXT("application/json"));
126124
HTTP_Post_Req->SetHeader(TEXT("Accept"), TEXT("application/json"));
127-
128125

129126
HTTP_Post_Req->SetHeader(TEXT("X-Access-Key"), *AccessKey);
130127
HTTP_Post_Req->SetTimeout(30);
131128
HTTP_Post_Req->SetURL(RequestURL);
132129
HTTP_Post_Req->SetContentAsString(Args);
133130

134-
UE_LOG(LogTemp, Display, TEXT("body: %s"), *Args);
135-
UE_LOG(LogTemp, Display, TEXT("request: %s"), *RequestURL);
136-
137-
131+
SEQ_LOG(Display, TEXT("body: %s"), *Args);
132+
SEQ_LOG(Display, TEXT("request: %s"), *RequestURL);
133+
138134
HTTP_Post_Req->OnProcessRequestComplete().BindLambda([OnSuccess, OnFailure](const FHttpRequestPtr& Request, FHttpResponsePtr Response, const bool bWasSuccessful)
139135
{
140136
if (bWasSuccessful)
141137
{
142138
const FString Content = Response->GetContentAsString();
143-
UE_LOG(LogTemp, Display, TEXT("Response: %s"), *Content);
139+
SEQ_LOG(Display, TEXT("Response: %s"), *Content);
144140
OnSuccess(Content);
145141
}
146142
else
147143
{
148144
if (Request.IsValid() && Response.IsValid())
149145
{
150146
const FString ErrorMessage = Response->GetContentAsString();
151-
UE_LOG(LogTemp, Error, TEXT("Request failed: %s"), *ErrorMessage);
147+
SEQ_LOG(Error, TEXT("Request failed: %s"), *ErrorMessage);
152148
OnFailure(FSequenceError(RequestFail, "Request failed: " + ErrorMessage));
153149
}
154150
else
155151
{
156-
UE_LOG(LogTemp, Error, TEXT("Request failed: Invalid Request Pointer"));
152+
SEQ_LOG(Error, TEXT("Request failed: Invalid Request Pointer"));
157153
OnFailure(FSequenceError(RequestFail, "Request failed: Invalid Request Pointer"));
158154
}
159155
}
@@ -174,7 +170,7 @@ template < typename T> FString USequenceMarketplace::BuildArgs(T StructIn)
174170
{
175171
if (!FJsonObjectConverter::UStructToJsonObjectString<T>(StructIn, Result))
176172
{
177-
UE_LOG(LogTemp, Display, TEXT("Failed to convert specified UStruct to a json object\n"));
173+
SEQ_LOG(Display, TEXT("Failed to convert specified UStruct to a json object\n"));
178174
}
179175
}
180176
return Result;
@@ -190,7 +186,7 @@ template<typename T> T USequenceMarketplace::BuildResponse(const FString Text)
190186

191187
if (!FJsonSerializer::Deserialize(TJsonReaderFactory<>::Create(Text), JSON_Step))
192188
{
193-
UE_LOG(LogTemp, Display, TEXT("Failed to convert String: %s to Json object"), *Text);
189+
SEQ_LOG(Display, TEXT("Failed to convert String: %s to Json object"), *Text);
194190
return T();
195191
}
196192
//this next line with throw an exception in null is used as an entry in json attributes! we need to remove null entries
@@ -202,7 +198,7 @@ template<typename T> T USequenceMarketplace::BuildResponse(const FString Text)
202198
{//use unreal parsing!
203199
if (!FJsonObjectConverter::JsonObjectToUStruct<T>(JSON_Step.ToSharedRef(), &Ret_Struct))
204200
{
205-
UE_LOG(LogTemp, Display, TEXT("Failed to convert Json Object: %s to USTRUCT of type T"), *Text);
201+
SEQ_LOG(Display, TEXT("Failed to convert Json Object: %s to USTRUCT of type T"), *Text);
206202
return T();
207203
}
208204
}
@@ -525,7 +521,7 @@ void USequenceMarketplace::AssertWeHaveSufficientBalance(const int64 ChainID, co
525521
Have = SellCurrencies[0].balance;
526522
}
527523

528-
UE_LOG(LogTemp, Display, TEXT("Have: %ld, Required: %ld"), Have, Required);
524+
SEQ_LOG(Display, TEXT("Have: %ld, Required: %ld"), Have, Required);
529525

530526
if(Have < Required)
531527
{

0 commit comments

Comments
 (0)