huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add event ids for logging

This commit is contained in:
Hao Kung 2015-10-19 15:02:10 -07:00
parent 79d3723df5
commit 4ce3efd28f
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Identity/RoleManager.cs
View File

@ -430,7 +430,7 @@ namespace Microsoft.AspNet.Identity
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
Logger.LogWarning("Role {roleId} validation failed: {errors}.", await GetRoleIdAsync(role), string.Join(";", errors.Select(e => e.Code))); Logger.LogWarning(0, "Role {roleId} validation failed: {errors}.", await GetRoleIdAsync(role), string.Join(";", errors.Select(e => e.Code)));
return IdentityResult.Failed(errors.ToArray()); return IdentityResult.Failed(errors.ToArray());
} }
return IdentityResult.Success; return IdentityResult.Success;

8
src/Microsoft.AspNet.Identity/SignInManager.cs
View File

@ -89,12 +89,12 @@ namespace Microsoft.AspNet.Identity
{ {
if (Options.SignIn.RequireConfirmedEmail && !(await UserManager.IsEmailConfirmedAsync(user))) if (Options.SignIn.RequireConfirmedEmail && !(await UserManager.IsEmailConfirmedAsync(user)))
{ {
Logger.LogWarning("User {userId} cannot sign in without a confirmed email.", await UserManager.GetUserIdAsync(user)); Logger.LogWarning(0, "User {userId} cannot sign in without a confirmed email.", await UserManager.GetUserIdAsync(user));
return false; return false;
} }
if (Options.SignIn.RequireConfirmedPhoneNumber && !(await UserManager.IsPhoneNumberConfirmedAsync(user))) if (Options.SignIn.RequireConfirmedPhoneNumber && !(await UserManager.IsPhoneNumberConfirmedAsync(user)))
{ {
Logger.LogWarning("User {userId} cannot sign in without a confirmed phone number.", await UserManager.GetUserIdAsync(user)); Logger.LogWarning(1, "User {userId} cannot sign in without a confirmed phone number.", await UserManager.GetUserIdAsync(user));
return false; return false;
} }
@ -212,7 +212,7 @@ namespace Microsoft.AspNet.Identity
await ResetLockout(user); await ResetLockout(user);
return await SignInOrTwoFactorAsync(user, isPersistent); return await SignInOrTwoFactorAsync(user, isPersistent);
} }
Logger.LogWarning("User {userId} failed to provide the correct password.", await UserManager.GetUserIdAsync(user)); Logger.LogWarning(2, "User {userId} failed to provide the correct password.", await UserManager.GetUserIdAsync(user));
if (UserManager.SupportsUserLockout && lockoutOnFailure) if (UserManager.SupportsUserLockout && lockoutOnFailure)
{ {
@ -522,7 +522,7 @@ namespace Microsoft.AspNet.Identity
private async Task<SignInResult> LockedOut(TUser user) private async Task<SignInResult> LockedOut(TUser user)
{ {
Logger.LogWarning("User {userId} is currently locked out.", await UserManager.GetUserIdAsync(user)); Logger.LogWarning(3, "User {userId} is currently locked out.", await UserManager.GetUserIdAsync(user));
return SignInResult.LockedOut; return SignInResult.LockedOut;
} }

28
src/Microsoft.AspNet.Identity/UserManager.cs
View File

@ -536,7 +536,7 @@ namespace Microsoft.AspNet.Identity
var success = result != PasswordVerificationResult.Failed; var success = result != PasswordVerificationResult.Failed;
if (!success) if (!success)
{ {
Logger.LogWarning("Invalid password for user {userId}.", await GetUserIdAsync(user)); Logger.LogWarning(0, "Invalid password for user {userId}.", await GetUserIdAsync(user));
} }
return success; return success;
} }
@ -583,7 +583,7 @@ namespace Microsoft.AspNet.Identity
var hash = await passwordStore.GetPasswordHashAsync(user, CancellationToken); var hash = await passwordStore.GetPasswordHashAsync(user, CancellationToken);
if (hash != null) if (hash != null)
{ {
Logger.LogWarning("User {userId} already has a password.", await GetUserIdAsync(user)); Logger.LogWarning(1, "User {userId} already has a password.", await GetUserIdAsync(user));
return IdentityResult.Failed(ErrorDescriber.UserAlreadyHasPassword()); return IdentityResult.Failed(ErrorDescriber.UserAlreadyHasPassword());
} }
var result = await UpdatePasswordHash(passwordStore, user, password); var result = await UpdatePasswordHash(passwordStore, user, password);
@ -624,7 +624,7 @@ namespace Microsoft.AspNet.Identity
} }
return await UpdateUserAsync(user); return await UpdateUserAsync(user);
} }
Logger.LogWarning("Change password failed for user {userId}.", await GetUserIdAsync(user)); Logger.LogWarning(2, "Change password failed for user {userId}.", await GetUserIdAsync(user));
return IdentityResult.Failed(ErrorDescriber.PasswordMismatch()); return IdentityResult.Failed(ErrorDescriber.PasswordMismatch());
} }
@ -838,7 +838,7 @@ namespace Microsoft.AspNet.Identity
var existingUser = await FindByLoginAsync(login.LoginProvider, login.ProviderKey); var existingUser = await FindByLoginAsync(login.LoginProvider, login.ProviderKey);
if (existingUser != null) if (existingUser != null)
{ {
Logger.LogWarning("AddLogin for user {userId} failed because it was already assocated with another user.", await GetUserIdAsync(user)); Logger.LogWarning(4, "AddLogin for user {userId} failed because it was already assocated with another user.", await GetUserIdAsync(user));
return IdentityResult.Failed(ErrorDescriber.LoginAlreadyAssociated()); return IdentityResult.Failed(ErrorDescriber.LoginAlreadyAssociated());
} }
await loginStore.AddLoginAsync(user, login, CancellationToken); await loginStore.AddLoginAsync(user, login, CancellationToken);
@ -1100,13 +1100,13 @@ namespace Microsoft.AspNet.Identity
private async Task<IdentityResult> UserAlreadyInRoleError(TUser user, string role) private async Task<IdentityResult> UserAlreadyInRoleError(TUser user, string role)
{ {
Logger.LogWarning("User {userId} is already in role {role}.", await GetUserIdAsync(user), role); Logger.LogWarning(5, "User {userId} is already in role {role}.", await GetUserIdAsync(user), role);
return IdentityResult.Failed(ErrorDescriber.UserAlreadyInRole(role)); return IdentityResult.Failed(ErrorDescriber.UserAlreadyInRole(role));
} }
private async Task<IdentityResult> UserNotInRoleError(TUser user, string role) private async Task<IdentityResult> UserNotInRoleError(TUser user, string role)
{ {
Logger.LogWarning("User {userId} is not in role {role}.", await GetUserIdAsync(user), role); Logger.LogWarning(6, "User {userId} is not in role {role}.", await GetUserIdAsync(user), role);
return IdentityResult.Failed(ErrorDescriber.UserNotInRole(role)); return IdentityResult.Failed(ErrorDescriber.UserNotInRole(role));
} }
@ -1418,7 +1418,7 @@ namespace Microsoft.AspNet.Identity
if (!await VerifyChangePhoneNumberTokenAsync(user, token, phoneNumber)) if (!await VerifyChangePhoneNumberTokenAsync(user, token, phoneNumber))
{ {
Logger.LogWarning("Change phone number for user {userId} failed with invalid token.", await GetUserIdAsync(user)); Logger.LogWarning(7, "Change phone number for user {userId} failed with invalid token.", await GetUserIdAsync(user));
return IdentityResult.Failed(ErrorDescriber.InvalidToken()); return IdentityResult.Failed(ErrorDescriber.InvalidToken());
} }
await store.SetPhoneNumberAsync(user, phoneNumber, CancellationToken); await store.SetPhoneNumberAsync(user, phoneNumber, CancellationToken);
@ -1486,7 +1486,7 @@ namespace Microsoft.AspNet.Identity
return true; return true;
} }
} }
Logger.LogWarning("VerifyChangePhoneNumberTokenAsync() failed for user {userId}.", await GetUserIdAsync(user)); Logger.LogWarning(8, "VerifyChangePhoneNumberTokenAsync() failed for user {userId}.", await GetUserIdAsync(user));
return false; return false;
} }
@ -1523,7 +1523,7 @@ namespace Microsoft.AspNet.Identity
if (!result) if (!result)
{ {
Logger.LogWarning("VerifyUserTokenAsync() failed with purpose: {purpose} for user {userId}.", purpose, await GetUserIdAsync(user)); Logger.LogWarning(9, "VerifyUserTokenAsync() failed with purpose: {purpose} for user {userId}.", purpose, await GetUserIdAsync(user));
} }
return result; return result;
} }
@ -1626,7 +1626,7 @@ namespace Microsoft.AspNet.Identity
var result = await _tokenProviders[tokenProvider].ValidateAsync("TwoFactor", token, this, user); var result = await _tokenProviders[tokenProvider].ValidateAsync("TwoFactor", token, this, user);
if (!result) if (!result)
{ {
Logger.LogWarning($"{nameof(VerifyTwoFactorTokenAsync)}() failed for user {await GetUserIdAsync(user)}."); Logger.LogWarning(10, $"{nameof(VerifyTwoFactorTokenAsync)}() failed for user {await GetUserIdAsync(user)}.");
} }
return result; return result;
} }
@ -1799,7 +1799,7 @@ namespace Microsoft.AspNet.Identity
if (!await store.GetLockoutEnabledAsync(user, CancellationToken)) if (!await store.GetLockoutEnabledAsync(user, CancellationToken))
{ {
Logger.LogWarning("Lockout for user {userId} failed because lockout is not enabled for this user.", await GetUserIdAsync(user)); Logger.LogWarning(11, "Lockout for user {userId} failed because lockout is not enabled for this user.", await GetUserIdAsync(user));
return IdentityResult.Failed(ErrorDescriber.UserLockoutNotEnabled()); return IdentityResult.Failed(ErrorDescriber.UserLockoutNotEnabled());
} }
await store.SetLockoutEndDateAsync(user, lockoutEnd, CancellationToken); await store.SetLockoutEndDateAsync(user, lockoutEnd, CancellationToken);
@ -1828,7 +1828,7 @@ namespace Microsoft.AspNet.Identity
{ {
return await UpdateUserAsync(user); return await UpdateUserAsync(user);
} }
Logger.LogWarning("User {userId} is locked out.", await GetUserIdAsync(user)); Logger.LogWarning(12, "User {userId} is locked out.", await GetUserIdAsync(user));
await store.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(Options.Lockout.DefaultLockoutTimeSpan), await store.SetLockoutEndDateAsync(user, DateTimeOffset.UtcNow.Add(Options.Lockout.DefaultLockoutTimeSpan),
CancellationToken); CancellationToken);
await store.ResetAccessFailedCountAsync(user, CancellationToken); await store.ResetAccessFailedCountAsync(user, CancellationToken);
@ -2064,7 +2064,7 @@ namespace Microsoft.AspNet.Identity
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
Logger.LogWarning("User {userId} validation failed: {errors}.", await GetUserIdAsync(user), string.Join(";", errors.Select(e => e.Code))); Logger.LogWarning(13, "User {userId} validation failed: {errors}.", await GetUserIdAsync(user), string.Join(";", errors.Select(e => e.Code)));
return IdentityResult.Failed(errors.ToArray()); return IdentityResult.Failed(errors.ToArray());
} }
return IdentityResult.Success; return IdentityResult.Success;
@ -2083,7 +2083,7 @@ namespace Microsoft.AspNet.Identity
} }
if (errors.Count > 0) if (errors.Count > 0)
{ {
Logger.LogWarning("User {userId} password validation failed: {errors}.", await GetUserIdAsync(user), string.Join(";", errors.Select(e => e.Code))); Logger.LogWarning(14, "User {userId} password validation failed: {errors}.", await GetUserIdAsync(user), string.Join(";", errors.Select(e => e.Code)));
return IdentityResult.Failed(errors.ToArray()); return IdentityResult.Failed(errors.ToArray());
} }
return IdentityResult.Success; return IdentityResult.Success;