yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revoke files where string is not concatenated

Browse Source
This commit is contained in:
lkoruba
2018-06-29 15:08:35 +02:00
parent 7e4f2957a3
commit 8359ea5862
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Components/BootLoader.cs
View File

@@ -347,7 +347,7 @@ namespace Umbraco.Core.Components
{
if (_booted == false)
{
_proflog.Logger.Warn<BootLoader>(() => "Cannot terminate, has not booted.");
_proflog.Logger.Warn<BootLoader>("Cannot terminate, has not booted.");
return;
}

2
src/Umbraco.Core/Persistence/DbConnectionExtensions.cs
View File

@@ -65,7 +65,7 @@ namespace Umbraco.Core.Persistence
catch (DbException e)
{
// Don't swallow this error, the exception is super handy for knowing "why" its not available
Current.Logger.Warn<IDbConnection>(e, () => "Configured database is reporting as not being available.");
Current.Logger.Warn<IDbConnection>(e, "Configured database is reporting as not being available.");
return false;
}

2
src/Umbraco.Core/Runtime/CoreRuntime.cs
View File

@@ -315,7 +315,7 @@ namespace Umbraco.Core.Runtime
catch (Exception e)
{
// can connect to the database but cannot access the migration table... need to install
logger.Warn<CoreRuntime>(e, () => "Could not check the upgrade state.");
logger.Warn<CoreRuntime>(e, "Could not check the upgrade state.");
logger.Debug<CoreRuntime>("Could not check the upgrade state, need to install Umbraco.");
_state.Level = RuntimeLevel.Install;
return;

2
src/Umbraco.Core/Services/Implement/UserService.cs
View File

@@ -333,7 +333,7 @@ namespace Umbraco.Core.Services.Implement
// if we are upgrading and an exception occurs, log and swallow it
if (_isUpgrading == false) throw;
Logger.Warn<UserService>(ex, () => "An error occurred attempting to save a user instance during upgrade, normally this warning can be ignored");
Logger.Warn<UserService>(ex, "An error occurred attempting to save a user instance during upgrade, normally this warning can be ignored");
// we don't want the uow to rollback its scope!
scope.Complete();

4
src/Umbraco.Core/Sync/DatabaseServerMessenger.cs
View File

@@ -142,7 +142,7 @@ namespace Umbraco.Core.Sync
var idle =_syncIdle.WaitOne(5000);
if (idle == false)
{
Logger.Warn<DatabaseServerMessenger>(() => "The wait lock timed out, application is shutting down. The current instruction batch will be re-processed.");
Logger.Warn<DatabaseServerMessenger>("The wait lock timed out, application is shutting down. The current instruction batch will be re-processed.");
}
},
weight);
@@ -178,7 +178,7 @@ namespace Umbraco.Core.Sync
{
// we haven't synced - in this case we aren't going to sync the whole thing, we will assume this is a new
// server and it will need to rebuild it's own caches, eg Lucene or the xml cache file.
Logger.Warn<DatabaseServerMessenger>(() => "No last synced Id found, this generally means this is a new server/install."
Logger.Warn<DatabaseServerMessenger>("No last synced Id found, this generally means this is a new server/install."
+ " The server will build its caches and indexes, and then adjust its last synced Id to the latest found in"
+ " the database and maintain cache updates based on that Id.");

10
src/Umbraco.Web/Editors/PasswordChanger.cs
View File

@@ -188,7 +188,7 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex)
{
_logger.Warn<PasswordChanger>(ex, () => "Could not reset member password");
_logger.Warn<PasswordChanger>(ex, "Could not reset member password");
return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not reset password, error: " + ex.Message + " (see log for full details)", new[] { "resetPassword" }) });
}
}
@@ -213,7 +213,7 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex)
{
_logger.Warn<PasswordChanger>(ex, () => "Could not change member password");
_logger.Warn<PasswordChanger>(ex, "Could not change member password");
return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, error: " + ex.Message + " (see log for full details)", new[] { "value" }) });
}
}
@@ -242,7 +242,7 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex)
{
_logger.Warn<PasswordChanger>(ex, () => "Could not change member password");
_logger.Warn<PasswordChanger>(ex, "Could not change member password");
return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, error: " + ex.Message + " (see log for full details)", new[] { "value" }) });
}
}
@@ -274,14 +274,14 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex1)
{
_logger.Warn<PasswordChanger>(ex1, () => "Could not change member password");
_logger.Warn<PasswordChanger>(ex1, "Could not change member password");
return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, error: " + ex1.Message + " (see log for full details)", new[] { "value" }) });
}
}
catch (Exception ex2)
{
_logger.Warn<PasswordChanger>(ex2, () => "Could not retrieve member password");
_logger.Warn<PasswordChanger>(ex2, "Could not retrieve member password");
return Attempt.Fail(new PasswordChangedModel { ChangeError = new ValidationResult("Could not change password, error: " + ex2.Message + " (see log for full details)", new[] { "value" }) });
}
}

2
src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
View File

@@ -78,7 +78,7 @@ namespace Umbraco.Web.PropertyEditors
catch (Exception ex)
{
// for some reason the value is invalid so continue as if there was no value there
_logger.Warn<ImageCropperPropertyValueEditor>(ex, () => "Could not parse current db value to a JObject.");
_logger.Warn<ImageCropperPropertyValueEditor>(ex, "Could not parse current db value to a JObject.");
}
if (string.IsNullOrWhiteSpace(currentPath) == false)
currentPath = _mediaFileSystem.GetRelativePath(currentPath);