Diplomarbeit-Absolventenverein/oqtane.framework
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging abstraction

Browse Source
This commit is contained in:
Shaun Walker 2019-10-26 11:00:45 -04:00
parent f59ec7bdac
commit e25bbe2e24
23 changed files with 79 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Oqtane.Server/Controllers/AliasController.cs
View File

@ -42,7 +42,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Alias = Aliases.AddAlias(Alias); Alias = Aliases.AddAlias(Alias);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Alias Added {Alias}", Alias); logger.Log(LogLevel.Information, this, LogFunction.Create, "Alias Added {Alias}", Alias);
} }
return Alias; return Alias;
} }
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Alias = Aliases.UpdateAlias(Alias); Alias = Aliases.UpdateAlias(Alias);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Alias Updated {Alias}", Alias); logger.Log(LogLevel.Information, this, LogFunction.Update, "Alias Updated {Alias}", Alias);
} }
return Alias; return Alias;
} }
@ -66,7 +66,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Aliases.DeleteAlias(id); Aliases.DeleteAlias(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Alias Deleted {AliasId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Alias Deleted {AliasId}", id);
} }
} }
} }

4
Oqtane.Server/Controllers/FileController.cs
View File

@ -110,7 +110,7 @@ namespace Oqtane.Controllers
{ {
// rename file now that the entire process is completed // rename file now that the entire process is completed
System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename)); System.IO.File.Move(Path.Combine(folder, filename + ".tmp"), Path.Combine(folder, filename));
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename)); logger.Log(LogLevel.Information, this, LogFunction.Create, "File Uploaded {File}", Path.Combine(folder, filename));
} }
} }
} }
@ -173,7 +173,7 @@ namespace Oqtane.Controllers
if (System.IO.File.Exists(file)) if (System.IO.File.Exists(file))
{ {
System.IO.File.Delete(file); System.IO.File.Delete(file);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "File Deleted {File}", file); logger.Log(LogLevel.Information, this, LogFunction.Delete, "File Deleted {File}", file);
} }
} }

2
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -279,7 +279,7 @@ namespace Oqtane.Controllers
public GenericResponse Upgrade() public GenericResponse Upgrade()
{ {
var response = new GenericResponse { Success = true, Message = "" }; var response = new GenericResponse { Success = true, Message = "" };
InstallationManager.InstallPackages("Framework"); InstallationManager.InstallPackages("Framework", true);
return response; return response;
} }
} }

10
Oqtane.Server/Controllers/ModuleController.cs
View File

@ -76,7 +76,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Module = Modules.AddModule(Module); Module = Modules.AddModule(Module);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Module Added {Module}", Module); logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", Module);
} }
return Module; return Module;
} }
@ -89,7 +89,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Module = Modules.UpdateModule(Module); Module = Modules.UpdateModule(Module);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Module Updated {Module}", Module); logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Updated {Module}", Module);
} }
return Module; return Module;
} }
@ -100,7 +100,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Modules.DeleteModule(id); Modules.DeleteModule(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Module Deleted {ModuleId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id);
} }
// GET api/<controller>/export?moduleid=x // GET api/<controller>/export?moduleid=x
@ -141,7 +141,7 @@ namespace Oqtane.Controllers
} }
} }
content = JsonSerializer.Serialize(modulecontent); content = JsonSerializer.Serialize(modulecontent);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Read, "Module Content Exported {ModuleId}", moduleid); logger.Log(LogLevel.Information, this, LogFunction.Read, "Module Content Exported {ModuleId}", moduleid);
} }
} }
} }
@ -187,7 +187,7 @@ namespace Oqtane.Controllers
var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype); var moduleobject = ActivatorUtilities.CreateInstance(ServiceProvider, moduletype);
((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version); ((IPortable)moduleobject).ImportModule(module, modulecontent.Content, modulecontent.Version);
success = true; success = true;
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Module Content Imported {ModuleId}", moduleid); logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Content Imported {ModuleId}", moduleid);
} }
} }
} }

8
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@ -52,7 +52,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
ModuleDefinitions.UpdateModuleDefinition(ModuleDefinition); ModuleDefinitions.UpdateModuleDefinition(ModuleDefinition);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", ModuleDefinition); logger.Log(LogLevel.Information, this, LogFunction.Update, "Module Definition Updated {ModuleDefinition}", ModuleDefinition);
} }
} }
@ -60,8 +60,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = Constants.HostRole)]
public void InstallModules() public void InstallModules()
{ {
InstallationManager.InstallPackages("Modules"); InstallationManager.InstallPackages("Modules", true);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Modules Installed"); logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
} }
// DELETE api/<controller>/5?siteid=x // DELETE api/<controller>/5?siteid=x
@ -88,7 +88,7 @@ namespace Oqtane.Controllers
} }
ModuleDefinitions.DeleteModuleDefinition(id, siteid); ModuleDefinitions.DeleteModuleDefinition(id, siteid);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Module Deleted {ModuleDefinitionId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleDefinitionId}", id);
InstallationManager.RestartApplication(); InstallationManager.RestartApplication();
} }

8
Oqtane.Server/Controllers/PageController.cs
View File

@ -50,7 +50,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Page = Pages.AddPage(Page); Page = Pages.AddPage(Page);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Page Added {Page}", Page); logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Added {Page}", Page);
} }
return Page; return Page;
} }
@ -63,7 +63,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Page = Pages.UpdatePage(Page); Page = Pages.UpdatePage(Page);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Page Updated {Page}", Page); logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Updated {Page}", Page);
} }
return Page; return Page;
} }
@ -84,7 +84,7 @@ namespace Oqtane.Controllers
} }
order += 2; order += 2;
} }
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Page Order Updated {SiteId} {ParentId}", siteid, parentid); logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Order Updated {SiteId} {ParentId}", siteid, parentid);
} }
// DELETE api/<controller>/5 // DELETE api/<controller>/5
@ -93,7 +93,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Pages.DeletePage(id); Pages.DeletePage(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Page Deleted {PageId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Deleted {PageId}", id);
} }
} }
} }

8
Oqtane.Server/Controllers/PageModuleController.cs
View File

@ -52,7 +52,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
PageModule = PageModules.AddPageModule(PageModule); PageModule = PageModules.AddPageModule(PageModule);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Page Module Added {PageModule}", PageModule); logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", PageModule);
} }
return PageModule; return PageModule;
} }
@ -65,7 +65,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
PageModule = PageModules.UpdatePageModule(PageModule); PageModule = PageModules.UpdatePageModule(PageModule);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Page Module Updated {PageModule}", PageModule); logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", PageModule);
} }
return PageModule; return PageModule;
} }
@ -86,7 +86,7 @@ namespace Oqtane.Controllers
} }
order += 2; order += 2;
} }
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane); logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
} }
// DELETE api/<controller>/5 // DELETE api/<controller>/5
@ -95,7 +95,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
PageModules.DeletePageModule(id); PageModules.DeletePageModule(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/PermissionController.cs
View File

@ -42,7 +42,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Permission = Permissions.AddPermission(Permission); Permission = Permissions.AddPermission(Permission);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Permission Added {Permission}", Permission); logger.Log(LogLevel.Information, this, LogFunction.Create, "Permission Added {Permission}", Permission);
} }
return Permission; return Permission;
} }
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Permission = Permissions.UpdatePermission(Permission); Permission = Permissions.UpdatePermission(Permission);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Permission Updated {Permission}", Permission); logger.Log(LogLevel.Information, this, LogFunction.Update, "Permission Updated {Permission}", Permission);
} }
return Permission; return Permission;
} }
@ -66,7 +66,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Permissions.DeletePermission(id); Permissions.DeletePermission(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Permission Deleted {PermissionId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Permission Deleted {PermissionId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/ProfileController.cs
View File

@ -49,7 +49,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Profile = Profiles.AddProfile(Profile); Profile = Profiles.AddProfile(Profile);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Profile Added {Profile}", Profile); logger.Log(LogLevel.Information, this, LogFunction.Create, "Profile Added {Profile}", Profile);
} }
return Profile; return Profile;
} }
@ -62,7 +62,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Profile = Profiles.UpdateProfile(Profile); Profile = Profiles.UpdateProfile(Profile);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Profile Updated {Profile}", Profile); logger.Log(LogLevel.Information, this, LogFunction.Update, "Profile Updated {Profile}", Profile);
} }
return Profile; return Profile;
} }
@ -73,7 +73,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Profiles.DeleteProfile(id); Profiles.DeleteProfile(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Profile Deleted {ProfileId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Profile Deleted {ProfileId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/RoleController.cs
View File

@ -49,7 +49,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Role = Roles.AddRole(Role); Role = Roles.AddRole(Role);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Role Added {Role}", Role); logger.Log(LogLevel.Information, this, LogFunction.Create, "Role Added {Role}", Role);
} }
return Role; return Role;
} }
@ -62,7 +62,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Role = Roles.UpdateRole(Role); Role = Roles.UpdateRole(Role);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Role Updated {Role}", Role); logger.Log(LogLevel.Information, this, LogFunction.Update, "Role Updated {Role}", Role);
} }
return Role; return Role;
} }
@ -73,7 +73,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Roles.DeleteRole(id); Roles.DeleteRole(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Role Deleted {RoleId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Role Deleted {RoleId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/SettingController.cs
View File

@ -45,7 +45,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId)) if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId))
{ {
Setting = Settings.AddSetting(Setting); Setting = Settings.AddSetting(Setting);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Setting Added {Setting}", Setting); logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", Setting);
} }
return Setting; return Setting;
} }
@ -58,7 +58,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId)) if (ModelState.IsValid && IsAuthorized(Setting.EntityName, Setting.EntityId))
{ {
Setting = Settings.UpdateSetting(Setting); Setting = Settings.UpdateSetting(Setting);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Setting Updated {Setting}", Setting); logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", Setting);
} }
return Setting; return Setting;
} }
@ -69,7 +69,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Settings.DeleteSetting(id); Settings.DeleteSetting(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Setting Deleted {SettingId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Setting Deleted {SettingId}", id);
} }
private bool IsAuthorized(string EntityName, int EntityId) private bool IsAuthorized(string EntityName, int EntityId)

6
Oqtane.Server/Controllers/SiteController.cs
View File

@ -67,7 +67,7 @@ namespace Oqtane.Controllers
{ {
Directory.CreateDirectory(folder); Directory.CreateDirectory(folder);
} }
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Site Added {Site}", Site); logger.Log(LogLevel.Information, this, LogFunction.Create, "Site Added {Site}", Site);
} }
} }
return Site; return Site;
@ -81,7 +81,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Site = Sites.UpdateSite(Site); Site = Sites.UpdateSite(Site);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Site Updated {Site}", Site); logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Updated {Site}", Site);
} }
return Site; return Site;
} }
@ -92,7 +92,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Sites.DeleteSite(id); Sites.DeleteSite(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Site Deleted {SiteId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Site Deleted {SiteId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/TenantController.cs
View File

@ -44,7 +44,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Tenant = Tenants.AddTenant(Tenant); Tenant = Tenants.AddTenant(Tenant);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Tenant Added {TenantId}", Tenant.TenantId); logger.Log(LogLevel.Information, this, LogFunction.Create, "Tenant Added {TenantId}", Tenant.TenantId);
} }
return Tenant; return Tenant;
} }
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
Tenant = Tenants.UpdateTenant(Tenant); Tenant = Tenants.UpdateTenant(Tenant);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Tenant Updated {TenantId}", Tenant.TenantId); logger.Log(LogLevel.Information, this, LogFunction.Update, "Tenant Updated {TenantId}", Tenant.TenantId);
} }
return Tenant; return Tenant;
} }
@ -68,7 +68,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
Tenants.DeleteTenant(id); Tenants.DeleteTenant(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Tenant Deleted {TenantId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Tenant Deleted {TenantId}", id);
} }
} }
} }

6
Oqtane.Server/Controllers/ThemeController.cs
View File

@ -48,8 +48,8 @@ namespace Oqtane.Controllers
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = Constants.HostRole)]
public void InstallThemes() public void InstallThemes()
{ {
InstallationManager.InstallPackages("Themes"); InstallationManager.InstallPackages("Themes", true);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Themes Installed"); logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
} }
// DELETE api/<controller>/xxx // DELETE api/<controller>/xxx
@ -74,7 +74,7 @@ namespace Oqtane.Controllers
{ {
System.IO.File.Delete(file); System.IO.File.Delete(file);
} }
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Theme Deleted {ThemeName}", themename); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Deleted {ThemeName}", themename);
InstallationManager.RestartApplication(); InstallationManager.RestartApplication();
} }

12
Oqtane.Server/Controllers/UserController.cs
View File

@ -127,7 +127,7 @@ namespace Oqtane.Controllers
} }
} }
user.Password = ""; // remove sensitive information user.Password = ""; // remove sensitive information
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "User Added {User}", user); logger.Log(LogLevel.Information, this, LogFunction.Create, "User Added {User}", user);
} }
return user; return user;
@ -151,7 +151,7 @@ namespace Oqtane.Controllers
} }
User = Users.UpdateUser(User); User = Users.UpdateUser(User);
User.Password = ""; // remove sensitive information User.Password = ""; // remove sensitive information
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "User Updated {User}", User); logger.Log(LogLevel.Information, this, LogFunction.Update, "User Updated {User}", User);
} }
return User; return User;
} }
@ -170,7 +170,7 @@ namespace Oqtane.Controllers
if (result != null) if (result != null)
{ {
Users.DeleteUser(id); Users.DeleteUser(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "User Deleted {UserId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Deleted {UserId}", id);
} }
} }
} }
@ -193,7 +193,7 @@ namespace Oqtane.Controllers
if (user != null) if (user != null)
{ {
user.IsAuthenticated = true; user.IsAuthenticated = true;
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Security, "User Login Successful {Username}", User.Username); logger.Log(LogLevel.Information, this, LogFunction.Security, "User Login Successful {Username}", User.Username);
if (SetCookie) if (SetCookie)
{ {
await IdentitySignInManager.SignInAsync(identityuser, IsPersistent); await IdentitySignInManager.SignInAsync(identityuser, IsPersistent);
@ -202,7 +202,7 @@ namespace Oqtane.Controllers
} }
else else
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Security, "User Login Failed {Username}", User.Username); logger.Log(LogLevel.Error, this, LogFunction.Security, "User Login Failed {Username}", User.Username);
} }
} }
} }
@ -216,7 +216,7 @@ namespace Oqtane.Controllers
public async Task Logout([FromBody] User User) public async Task Logout([FromBody] User User)
{ {
await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme); await HttpContext.SignOutAsync(IdentityConstants.ApplicationScheme);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Security, "User Logout {Username}", User.Username); logger.Log(LogLevel.Information, this, LogFunction.Security, "User Logout {Username}", User.Username);
} }
// GET api/<controller>/current // GET api/<controller>/current

6
Oqtane.Server/Controllers/UserRoleController.cs
View File

@ -49,7 +49,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
UserRole = UserRoles.AddUserRole(UserRole); UserRole = UserRoles.AddUserRole(UserRole);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "User Role Added {UserRole}", UserRole); logger.Log(LogLevel.Information, this, LogFunction.Create, "User Role Added {UserRole}", UserRole);
} }
return UserRole; return UserRole;
} }
@ -62,7 +62,7 @@ namespace Oqtane.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
UserRole = UserRoles.UpdateUserRole(UserRole); UserRole = UserRoles.UpdateUserRole(UserRole);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "User Role Updated {UserRole}", UserRole); logger.Log(LogLevel.Information, this, LogFunction.Update, "User Role Updated {UserRole}", UserRole);
} }
return UserRole; return UserRole;
} }
@ -73,7 +73,7 @@ namespace Oqtane.Controllers
public void Delete(int id) public void Delete(int id)
{ {
UserRoles.DeleteUserRole(id); UserRoles.DeleteUserRole(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "User Role Deleted {UserRoleId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "User Role Deleted {UserRoleId}", id);
} }
} }
} }

2
Oqtane.Server/Infrastructure/IInstallationManager.cs
View File

@ -2,7 +2,7 @@
{ {
public interface IInstallationManager public interface IInstallationManager
{ {
void InstallPackages(string Folders); void InstallPackages(string Folders, bool Restart);
void RestartApplication(); void RestartApplication();
} }
} }

4
Oqtane.Server/Infrastructure/ILogManager.cs
View File

@ -6,8 +6,8 @@ namespace Oqtane.Infrastructure
{ {
public interface ILogManager public interface ILogManager
{ {
void Log(LogLevel Level, string Category, LogFunction Function, string Message, params object[] Args); void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args);
void Log(LogLevel Level, string Category, LogFunction Function, Exception Exception, string Message, params object[] Args); void Log(LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args);
void Log(Log Log); void Log(Log Log);
} }
} }

4
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -17,7 +17,7 @@ namespace Oqtane.Infrastructure
this.environment = environment; this.environment = environment;
} }
public void InstallPackages(string Folders) public void InstallPackages(string Folders, bool Restart)
{ {
bool install = false; bool install = false;
string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
@ -73,7 +73,7 @@ namespace Oqtane.Infrastructure
} }
} }
if (install) if (install && Restart)
{ {
// restart application // restart application
RestartApplication(); RestartApplication();

17
Oqtane.Server/Infrastructure/LogManager.cs
View File

@ -25,12 +25,12 @@ namespace Oqtane.Infrastructure
this.Accessor = Accessor; this.Accessor = Accessor;
} }
public void Log(LogLevel Level, string Category, LogFunction Function, string Message, params object[] Args) public void Log(LogLevel Level, object Class, LogFunction Function, string Message, params object[] Args)
{ {
Log(Level, Category, Function, null, Message, Args); Log(Level, Class.GetType().AssemblyQualifiedName, Function, null, Message, Args);
} }
public void Log(LogLevel Level, string Category, LogFunction Function, Exception Exception, string Message, params object[] Args) public void Log(LogLevel Level, object Class, LogFunction Function, Exception Exception, string Message, params object[] Args)
{ {
Alias alias = TenantResolver.GetAlias(); Alias alias = TenantResolver.GetAlias();
Log log = new Log(); Log log = new Log();
@ -47,8 +47,15 @@ namespace Oqtane.Infrastructure
log.Url = request.Scheme.ToString() + "://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString(); log.Url = request.Scheme.ToString() + "://" + request.Host.ToString() + request.Path.ToString() + request.QueryString.ToString();
} }
log.Category = Category; if (Class.GetType() != null)
log.Feature = Utilities.GetTypeNameLastSegment(Category, 0); {
log.Category = Class.GetType().AssemblyQualifiedName;
}
else
{
log.Category = Class.ToString();
}
log.Feature = Utilities.GetTypeNameLastSegment(log.Category, 0);
log.Function = Enum.GetName(typeof(LogFunction), Function); log.Function = Enum.GetName(typeof(LogFunction), Function);
log.Level = Enum.GetName(typeof(LogLevel), Level); log.Level = Enum.GetName(typeof(LogLevel), Level);
if (Exception != null) if (Exception != null)

14
Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
View File

@ -42,7 +42,7 @@ namespace Oqtane.Modules.HtmlText.Controllers
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Read, ex, "Get Error {Error}", ex.Message); logger.Log(LogLevel.Error, this, LogFunction.Read, ex, "Get Error {Error}", ex.Message);
throw; throw;
} }
} }
@ -57,13 +57,13 @@ namespace Oqtane.Modules.HtmlText.Controllers
if (ModelState.IsValid && HtmlText.ModuleId == EntityId) if (ModelState.IsValid && HtmlText.ModuleId == EntityId)
{ {
HtmlText = htmltext.AddHtmlText(HtmlText); HtmlText = htmltext.AddHtmlText(HtmlText);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Create, "Html/Text Added {HtmlText}", HtmlText); logger.Log(LogLevel.Information, this, LogFunction.Create, "Html/Text Added {HtmlText}", HtmlText);
} }
return HtmlText; return HtmlText;
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Create, ex, "Post Error {Error}", ex.Message); logger.Log(LogLevel.Error, this, LogFunction.Create, ex, "Post Error {Error}", ex.Message);
throw; throw;
} }
} }
@ -78,13 +78,13 @@ namespace Oqtane.Modules.HtmlText.Controllers
if (ModelState.IsValid && HtmlText.ModuleId == EntityId) if (ModelState.IsValid && HtmlText.ModuleId == EntityId)
{ {
HtmlText = htmltext.UpdateHtmlText(HtmlText); HtmlText = htmltext.UpdateHtmlText(HtmlText);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Update, "Html/Text Updated {HtmlText}", HtmlText); logger.Log(LogLevel.Information, this, LogFunction.Update, "Html/Text Updated {HtmlText}", HtmlText);
} }
return HtmlText; return HtmlText;
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Update, ex, "Put Error {Error}", ex.Message); logger.Log(LogLevel.Error, this, LogFunction.Update, ex, "Put Error {Error}", ex.Message);
throw; throw;
} }
} }
@ -99,12 +99,12 @@ namespace Oqtane.Modules.HtmlText.Controllers
if (id == EntityId) if (id == EntityId)
{ {
htmltext.DeleteHtmlText(id); htmltext.DeleteHtmlText(id);
logger.Log(LogLevel.Information, this.GetType().AssemblyQualifiedName, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id); logger.Log(LogLevel.Information, this, LogFunction.Delete, "Html/Text Deleted {HtmlTextId}", id);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Delete, ex, "Delete Error {Error}", ex.Message); logger.Log(LogLevel.Error, this, LogFunction.Delete, ex, "Delete Error {Error}", ex.Message);
throw; throw;
} }
} }

2
Oqtane.Server/Security/PermissionHandler.cs
View File

@ -32,7 +32,7 @@ namespace Oqtane.Security
} }
else else
{ {
logger.Log(LogLevel.Error, this.GetType().AssemblyQualifiedName, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, EntityId); logger.Log(LogLevel.Error, this, LogFunction.Security, "User {User} Does Not Have {PermissionName} Permission For {EntityName}:{EntityId}", context.User, requirement.PermissionName, requirement.EntityName, EntityId);
} }
} }
return Task.CompletedTask; return Task.CompletedTask;

2
Oqtane.Server/Startup.cs
View File

@ -251,7 +251,7 @@ namespace Oqtane.Server
} }
// install any modules or themes // install any modules or themes
InstallationManager.InstallPackages("Modules,Themes"); InstallationManager.InstallPackages("Modules,Themes", false);
app.UseHttpsRedirection(); app.UseHttpsRedirection();