Skip to content

Change log level to information in pubsub examples #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
halspang merged 2 commits into from
Sep 1, 2022
Merged

Change log level to information in pubsub examples #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4783532
Change log level to information in pubsub examples
yash-nisar Aug 31, 2022
befaf3d
Merge branch 'master' into logging
halspang Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions examples/AspNetCore/ControllerSample/Controllers/SampleController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ public ActionResult<Account> Get([FromState(StoreName)] StateEntry<Account> acco
[HttpPost("deposit")]
public async Task<ActionResult<Account>> Deposit(Transaction transaction, [FromServices] DaprClient daprClient)
{
logger.LogDebug("Enter deposit");
logger.LogInformation("Enter deposit");
var state = await daprClient.GetStateEntryAsync<Account>(StoreName, transaction.Id);
state.Value ??= new Account() { Id = transaction.Id, };
logger.LogDebug("Id is {0}, the amount to be deposited is {1}", transaction.Id, transaction.Amount);
logger.LogInformation("Id is {0}, the amount to be deposited is {1}", transaction.Id, transaction.Amount);

if (transaction.Amount < 0m)
{
return BadRequest(new { statusCode = 400, message = "bad request" });
}

state.Value.Balance += transaction.Amount;
logger.LogDebug("Balance is {0}", state.Value.Balance);
logger.LogInformation("Balance is {0}", state.Value.Balance);
await state.SaveAsync();
return state.Value;
}
Expand All @@ -93,7 +93,7 @@ public async Task<ActionResult<Account>> Deposit(Transaction transaction, [FromS
[HttpPost("deadLetterTopicRoute")]
public ActionResult<Account> ViewErrorMessage(Transaction transaction)
{
logger.LogDebug("The amount cannot be negative: {0}", transaction.Amount);
logger.LogInformation("The amount cannot be negative: {0}", transaction.Amount);
return Ok();
}

Expand All @@ -108,9 +108,9 @@ public ActionResult<Account> ViewErrorMessage(Transaction transaction)
[HttpPost("withdraw")]
public async Task<ActionResult<Account>> Withdraw(Transaction transaction, [FromServices] DaprClient daprClient)
{
logger.LogDebug("Enter withdraw method...");
logger.LogInformation("Enter withdraw method...");
var state = await daprClient.GetStateEntryAsync<Account>(StoreName, transaction.Id);
logger.LogDebug("Id is {0}, the amount to be withdrawn is {1}", transaction.Id, transaction.Amount);
logger.LogInformation("Id is {0}, the amount to be withdrawn is {1}", transaction.Id, transaction.Amount);

if (state.Value == null)
{
Expand All @@ -122,7 +122,7 @@ public async Task<ActionResult<Account>> Withdraw(Transaction transaction, [From
}

state.Value.Balance -= transaction.Amount;
logger.LogDebug("Balance is {0}", state.Value.Balance);
logger.LogInformation("Balance is {0}", state.Value.Balance);
await state.SaveAsync();
return state.Value;
}
Expand All @@ -138,7 +138,7 @@ public async Task<ActionResult<Account>> Withdraw(Transaction transaction, [From
[HttpPost("withdraw.v2")]
public async Task<ActionResult<Account>> WithdrawV2(TransactionV2 transaction, [FromServices] DaprClient daprClient)
{
logger.LogDebug("Enter withdraw.v2");
logger.LogInformation("Enter withdraw.v2");
if (transaction.Channel == "mobile" && transaction.Amount > 10000)
{
return this.Unauthorized("mobile transactions for large amounts are not permitted.");
Expand All @@ -161,7 +161,7 @@ public async Task<ActionResult<Account>> WithdrawV2(TransactionV2 transaction, [
[HttpPost("throwException")]
public async Task<ActionResult<Account>> ThrowException(Transaction transaction, [FromServices] DaprClient daprClient)
{
logger.LogDebug("Enter ThrowException");
logger.LogInformation("Enter ThrowException");
var task = Task.Delay(10);
await task;
return BadRequest(new { statusCode = 400, message = "bad request" });
Expand Down
28 changes: 14 additions & 14 deletions examples/AspNetCore/RoutingSample/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,33 +110,33 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, JsonSeri

async Task Balance(HttpContext context)
{
logger.LogDebug("Enter Balance");
logger.LogInformation("Enter Balance");
var client = context.RequestServices.GetRequiredService<DaprClient>();

var id = (string)context.Request.RouteValues["id"];
logger.LogDebug("id is {0}", id);
logger.LogInformation("id is {0}", id);
var account = await client.GetStateAsync<Account>(StoreName, id);
if (account == null)
{
logger.LogDebug("Account not found");
logger.LogInformation("Account not found");
context.Response.StatusCode = 404;
return;
}

logger.LogDebug("Account balance is {0}", account.Balance);
logger.LogInformation("Account balance is {0}", account.Balance);

context.Response.ContentType = "application/json";
await JsonSerializer.SerializeAsync(context.Response.Body, account, serializerOptions);
}

async Task Deposit(HttpContext context)
{
logger.LogDebug("Enter Deposit");
logger.LogInformation("Enter Deposit");

var client = context.RequestServices.GetRequiredService<DaprClient>();
var transaction = await JsonSerializer.DeserializeAsync<Transaction>(context.Request.Body, serializerOptions);

logger.LogDebug("Id is {0}, Amount is {1}", transaction.Id, transaction.Amount);
logger.LogInformation("Id is {0}, Amount is {1}", transaction.Id, transaction.Amount);

var account = await client.GetStateAsync<Account>(StoreName, transaction.Id);
if (account == null)
Expand All @@ -146,14 +146,14 @@ async Task Deposit(HttpContext context)

if (transaction.Amount < 0m)
{
logger.LogDebug("Invalid amount");
logger.LogInformation("Invalid amount");
context.Response.StatusCode = 400;
return;
}

account.Balance += transaction.Amount;
await client.SaveStateAsync(StoreName, transaction.Id, account);
logger.LogDebug("Balance is {0}", account.Balance);
logger.LogInformation("Balance is {0}", account.Balance);

context.Response.ContentType = "application/json";
await JsonSerializer.SerializeAsync(context.Response.Body, account, serializerOptions);
Expand All @@ -164,38 +164,38 @@ async Task ViewErrorMessage(HttpContext context)
var client = context.RequestServices.GetRequiredService<DaprClient>();
var transaction = await JsonSerializer.DeserializeAsync<Transaction>(context.Request.Body, serializerOptions);

logger.LogDebug("The amount cannot be negative: {0}", transaction.Amount);
logger.LogInformation("The amount cannot be negative: {0}", transaction.Amount);

return;
}

async Task Withdraw(HttpContext context)
{
logger.LogDebug("Enter Withdraw");
logger.LogInformation("Enter Withdraw");

var client = context.RequestServices.GetRequiredService<DaprClient>();
var transaction = await JsonSerializer.DeserializeAsync<Transaction>(context.Request.Body, serializerOptions);

logger.LogDebug("Id is {0}, Amount is {1}", transaction.Id, transaction.Amount);
logger.LogInformation("Id is {0}, Amount is {1}", transaction.Id, transaction.Amount);

var account = await client.GetStateAsync<Account>(StoreName, transaction.Id);
if (account == null)
{
logger.LogDebug("Account not found");
logger.LogInformation("Account not found");
context.Response.StatusCode = 404;
return;
}

if (transaction.Amount < 0m)
{
logger.LogDebug("Invalid amount");
logger.LogInformation("Invalid amount");
context.Response.StatusCode = 400;
return;
}

account.Balance -= transaction.Amount;
await client.SaveStateAsync(StoreName, transaction.Id, account);
logger.LogDebug("Balance is {0}", account.Balance);
logger.LogInformation("Balance is {0}", account.Balance);

context.Response.ContentType = "application/json";
await JsonSerializer.SerializeAsync(context.Response.Body, account, serializerOptions);
Expand Down