Skip to content
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

Inline logger helpers for idiomatic usage #270

Merged
merged 1 commit into from
Mar 28, 2025
Merged

Inline logger helpers for idiomatic usage #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build-support/nuke-build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ partial class Build : NukeBuild
readonly bool BuildEms = false;

[Parameter("Version")]
readonly string ProjectVersion = "3.0.2";
readonly string ProjectVersion = "3.1.0";

[Solution] readonly Solution Solution;
[GitRepository] readonly GitRepository GitRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...ng.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FedExShippingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class FedExShippingService : IShippingService

public void ShipOrder(Order order)
{
log.Info("Shipping order id = " + order.Id);
log.LogInformation("Shipping order id = {OrderId} ", order.Id);
}
}
}
4 changes: 2 additions & 2 deletions ...ring.Data.NHibernate.Northwind/src/Spring.Northwind.Service/Service/FulfillmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public void ProcessCustomer(string customerId)
{
if (order.ShippedDate.HasValue)
{
log.Warn("Order with " + order.Id + " has already been shipped, skipping.");
log.LogWarning("Order {OrderId} has already been shipped, skipping.", order.Id);
continue;
}

//Validate Order
Validate(order);
log.Info("Order " + order.Id + " validated, proceeding with shipping..");
log.LogInformation("Order {OrderId} validated, proceeding with shipping..", order.Id);

//Ship with external shipping service
ShippingService.ShipOrder(order);
Expand Down
10 changes: 4 additions & 6 deletions examples/Spring/Spring.IoCQuickStart.MovieFinder/src/MovieFinder/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,16 @@ public static void Main()

MovieLister lister = (MovieLister) ctx.GetObject("MyMovieLister");
Movie[] movies = lister.MoviesDirectedBy("Roberto Benigni");
LOG.Debug("Searching for movie...");
LOG.LogDebug("Searching for movie...");
foreach (Movie movie in movies)
{
LOG.Debug(
string.Format("Movie Title = '{0}', Director = '{1}'.",
movie.Title, movie.Director));
LOG.LogDebug("Movie Title = '{Title}', Director = '{Director}'.", movie.Title, movie.Director);
}
LOG.Debug("MovieApp Done.");
LOG.LogDebug("MovieApp Done.");
}
catch (Exception e)
{
LOG.Error("Movie Finder is broken.", e);
LOG.LogError("Movie Finder is broken.", e);
}
finally
{
Expand Down
6 changes: 3 additions & 3 deletions ...Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Handlers/StockAppHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public StockController StockController

public void Handle(string data)
{
log.Info(string.Format("Received market data. " + data));
log.LogInformation("Received market data. " + data);

// forward to controller to update view
stockController.UpdateMarketData(data);
Expand All @@ -33,13 +33,13 @@ public void Handle(string data)

public void Handle(TradeResponse tradeResponse)
{
log.Info(string.Format("Received trade resonse. Ticker = {0}, Price = {1}", tradeResponse.Ticker, tradeResponse.Price));
log.LogInformation("Received trade resonse. Ticker = {TradeResponseTicker}, Price = {TradeResponsePrice}", tradeResponse.Ticker, tradeResponse.Price);
stockController.UpdateTrade(tradeResponse);
}

public void Handle(object catchAllObject)
{
log.Error("could not handle object of type = " + catchAllObject.GetType());
log.LogError("could not handle object of type {ObjectType}", catchAllObject.GetType());
}
}
}
6 changes: 3 additions & 3 deletions examples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static void Main()
{
try
{
log.Info("Running....");
log.LogInformation("Running....");
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
using (IApplicationContext ctx = ContextRegistry.GetContext())
Expand All @@ -34,13 +34,13 @@ static void Main()
}
catch (Exception e)
{
log.Error("Spring.MsmqQuickStart.Client is broken.", e);
log.LogError(e, "Spring.MsmqQuickStart.Client is broken.");
}
}

private static void ThreadException(object sender, ThreadExceptionEventArgs e)
{
log.Error("Uncaught application exception.", e.Exception);
log.LogError(e.Exception, "Uncaught application exception.");
Application.Exit();
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ples/Spring/Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Client/UI/StockForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private void OnSendTradeRequest(object sender, EventArgs e)
//Instead a hardcoded trade request is created in the controller.
tradeRequestStatusTextBox.Text = "Request Pending...";
stockController.SendTradeRequest();
log.Info("Sent trade request.");
log.LogInformation("Sent trade request.");
}

public void UpdateTrade(TradeResponse trade)
Expand Down
6 changes: 3 additions & 3 deletions ...mqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Gateways/MarketDataServiceGateway.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public void SendMarketData()
while (true)
{
string data = GenerateFakeMarketData();
log.Info("Sending market data.");
log.LogInformation("Sending market data.");
MessageQueueTemplate.ConvertAndSend(data);
log.Info("Sleeping " + sleepTimeInSeconds + " seconds before sending more market data.");
log.LogInformation("Sleeping {SleepTimeSeconds} seconds before sending more market data.", sleepTimeInSeconds);
Thread.Sleep(sleepTimeInSeconds);
}
}
Expand Down Expand Up @@ -59,4 +59,4 @@ private double Gaussian()
//y2 = x2 * w;
}
}
}
}
2 changes: 1 addition & 1 deletion ...Spring.MsmqQuickStart/src/Spring/Spring.MsmqQuickStart.Server/Handlers/StockAppHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public StockAppHandler(IExecutionVenueService executionVenueService, ICreditChec

public TradeResponse Handle(TradeRequest tradeRequest)
{
log.Info("received trade request - sleeping 2s to simulate long-running task");
log.LogInformation("received trade request - sleeping 2s to simulate long-running task");
TradeResponse tradeResponse;
ArrayList errors = new ArrayList();
if (creditCheckService.CanExecute(tradeRequest, errors))
Expand Down
6 changes: 3 additions & 3 deletions ...g/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/Handlers/StockAppHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public StockController StockController

public void Handle(Hashtable data)
{
log.Info(string.Format("Received market data. Ticker = {0}, Price = {1}", data["TICKER"], data["PRICE"]));
log.LogInformation("Received market data. Ticker = {Ticker}, Price = {Price}", data["TICKER"], data["PRICE"]);

// forward to controller to update view
stockController.UpdateMarketData(data);
Expand All @@ -54,13 +54,13 @@ public void Handle(Hashtable data)

public void Handle(TradeResponse tradeResponse)
{
log.Info(string.Format("Received trade resonse. Ticker = {0}, Price = {1}", tradeResponse.Ticker, tradeResponse.Price));
log.LogInformation("Received trade response. Ticker = {TradeResponseTicker}, Price = {TradeResponsePrice}", tradeResponse.Ticker, tradeResponse.Price);
stockController.UpdateTrade(tradeResponse);
}

public void Handle(object catchAllObject)
{
log.Error("could not handle object of type = " + catchAllObject.GetType());
log.LogError("could not handle object of type = {ObjectType}", catchAllObject.GetType());
}
}
}
2 changes: 1 addition & 1 deletion examples/Spring/Spring.NmsQuickStart/src/Spring/Spring.NmsQuickStart.Client/UI/StockForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private void OnSendTradeRequest(object sender, EventArgs e)
//Instead a hardcoded trade request is created in the controller.
tradeRequestStatusTextBox.Text = "Request Pending...";
stockController.SendTradeRequest();
log.Info("Sent trade request.");
log.LogInformation("Sent trade request.");
}

public void UpdateTrade(TradeResponse trade)
Expand Down
4 changes: 2 additions & 2 deletions ...NmsQuickStart/src/Spring/Spring.NmsQuickStart.Server/Gateways/MarketDataServiceGateway.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public void SendMarketData()
while (true)
{
IDictionary data = GenerateFakeMarketData();
log.Info("Sending market data.");
log.LogInformation("Sending market data.");
NmsTemplate.ConvertAndSend(data);
log.Info("Sleeping " + sleepTimeInSeconds + " seconds before sending more market data.");
log.LogInformation("Sleeping {SleepTimeInSeconds} seconds before sending more market data.", sleepTimeInSeconds);
Thread.Sleep(sleepTimeInSeconds);
}
}
Expand Down
2 changes: 0 additions & 2 deletions ...ng.NmsQuickStart/test/Spring/Spring.NmsQuickStart.Tests/Spring.NmsQuickStart.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -23,7 +22,6 @@
<DefineConstants>TRACE;NET_4_0</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
4 changes: 2 additions & 2 deletions src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private void MapAllExceptionHandlingMethods(object advice)

if(log.IsEnabled(LogLevel.Debug))
{
log.Debug("Found exception handler method: " + method);
log.LogDebug("Found exception handler method: " + method);
}

#endregion
Expand Down Expand Up @@ -266,7 +266,7 @@ private MethodInfo GetExceptionHandler(Exception exception)

if(log.IsEnabled(LogLevel.Debug))
{
log.Debug("Trying to find handler for exception of type [" + exception.GetType().Name + "].");
log.LogDebug("Trying to find handler for exception of type [" + exception.GetType().Name + "].");
}

#endregion
Expand Down
6 changes: 3 additions & 3 deletions src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ protected virtual List<IAdvisor> FindAdvisorsThatCanApply(List<IAdvisor> candida
{
if (logger.IsEnabled(LogLevel.Information))
{
logger.Info($"Candidate advisor [{candidate}] accepted for targetType [{targetType}]");
logger.LogInformation($"Candidate advisor [{candidate}] accepted for targetType [{targetType}]");
}
eligibleAdvisors.Add(candidate);
}
Expand All @@ -200,15 +200,15 @@ protected virtual List<IAdvisor> FindAdvisorsThatCanApply(List<IAdvisor> candida
{
if (logger.IsEnabled(LogLevel.Information))
{
logger.Info($"Candidate advisor [{candidate}] accepted for targetType [{targetType}]");
logger.LogInformation($"Candidate advisor [{candidate}] accepted for targetType [{targetType}]");
}
eligibleAdvisors.Add(candidate);
}
else
{
if (logger.IsEnabled(LogLevel.Information))
{
logger.Info($"Candidate advisor [{candidate}] rejected for targetType [{targetType}]");
logger.LogInformation($"Candidate advisor [{candidate}] rejected for targetType [{targetType}]");
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public virtual object PostProcessAfterInitialization(object obj, string objectNa
{
if (logger.IsEnabled(LogLevel.Debug))
{
logger.Debug(string.Format("Did not attempt to autoproxy infrastructure type [{0}]", objectType));
logger.LogDebug(string.Format("Did not attempt to autoproxy infrastructure type [{0}]", objectType));
}

nonAdvisedObjects.Add(cacheKey);
Expand All @@ -249,7 +249,7 @@ public virtual object PostProcessAfterInitialization(object obj, string objectNa
{
if (logger.IsEnabled(LogLevel.Debug))
{
logger.Debug(string.Format("Skipping type [{0}]", objectType));
logger.LogDebug(string.Format("Skipping type [{0}]", objectType));
}

nonAdvisedObjects.Add(cacheKey);
Expand Down Expand Up @@ -390,7 +390,7 @@ protected virtual ITargetSource GetCustomTargetSource(Type objectType, string na
// found a match
if (logger.IsEnabled(LogLevel.Information))
{
logger.Info(string.Format("TargetSourceCreator [{0} found custom TargetSource for object with objectName '{1}'", tsc, name));
logger.LogInformation(string.Format("TargetSourceCreator [{0} found custom TargetSource for object with objectName '{1}'", tsc, name));
}
return ts;
}
Expand Down Expand Up @@ -514,7 +514,7 @@ protected virtual IList<IAdvisor> BuildAdvisors(string targetName, IList<object>
{
int nrOfCommonInterceptors = commonInterceptors != null ? commonInterceptors.Count : 0;
int nrOfSpecificInterceptors = specificInterceptors != null ? specificInterceptors.Count : 0;
logger.Info(string.Format("Creating implicit proxy for object '{0}' with {1} common interceptors and {2} specific interceptors", targetName, nrOfCommonInterceptors, nrOfSpecificInterceptors));
logger.LogInformation(string.Format("Creating implicit proxy for object '{0}' with {1} common interceptors and {2} specific interceptors", targetName, nrOfCommonInterceptors, nrOfSpecificInterceptors));
}


Expand Down Expand Up @@ -576,7 +576,7 @@ public object PostProcessBeforeInstantiation(Type objectType, string objectName)
{
if (logger.IsEnabled(LogLevel.Debug))
{
logger.Debug(string.Format("Did not attempt to autoproxy infrastructure type [{0}]", objectType));
logger.LogDebug(string.Format("Did not attempt to autoproxy infrastructure type [{0}]", objectType));
}

nonAdvisedObjects.Add(cacheKey);
Expand All @@ -587,7 +587,7 @@ public object PostProcessBeforeInstantiation(Type objectType, string objectName)
{
if (logger.IsEnabled(LogLevel.Debug))
{
logger.Debug(string.Format("Skipping type [{0}]", objectType));
logger.LogDebug(string.Format("Skipping type [{0}]", objectType));
}

nonAdvisedObjects.Add(cacheKey);
Expand Down
2 changes: 1 addition & 1 deletion src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public virtual List<IAdvisor> FindAdvisorObjects(Type targetType, string targetN
{
if (_log.IsEnabled(LogLevel.Debug))
{
_log.Debug(string.Format("Ignoring currently created advisor '{0}': exception message = {1}",
_log.LogDebug(string.Format("Ignoring currently created advisor '{0}': exception message = {1}",
name, ex.Message));
}
continue;
Expand Down
4 changes: 2 additions & 2 deletions src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ public ITargetSource GetTargetSource(Type objectType, string name, IObjectFactor
if (!(factory is IObjectDefinitionRegistry))
{
if (logger.IsEnabled(LogLevel.Warning))
logger.Warn("Cannot do autopooling with a IObjectFactory that doesn't implement IObjectDefinitionRegistry");
logger.LogWarning("Cannot do autopooling with a IObjectFactory that doesn't implement IObjectDefinitionRegistry");
return null;
}
IObjectDefinitionRegistry definitionRegistry = (IObjectDefinitionRegistry) factory;
RootObjectDefinition definition = (RootObjectDefinition) definitionRegistry.GetObjectDefinition(name);

if (logger.IsEnabled(LogLevel.Information))
logger.Info("Configuring AbstractPrototypeBasedTargetSource...");
logger.LogInformation("Configuring AbstractPrototypeBasedTargetSource...");

// Infinite cycle will result if we don't use a different factory,
// because a GetObject() call with this objectName will go through the autoproxy
Expand Down
Loading