Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-04 19:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove/replace console writes with debug logging

Browse source
This commit is contained in:
Slendy 2023-08-31 18:32:24 -05:00
commit 15dbf562aa
No known key found for this signature in database
GPG key ID: 7288D68361B91428
4 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ProjectLighthouse.Servers.GameServer/Controllers/ActivityController.cs
View file

@ -3,10 +3,12 @@ using LBPUnion.ProjectLighthouse.Database;
using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Filter.Filters.Activity; using LBPUnion.ProjectLighthouse.Filter.Filters.Activity;
using LBPUnion.ProjectLighthouse.Helpers; using LBPUnion.ProjectLighthouse.Helpers;
using LBPUnion.ProjectLighthouse.Logging;
using LBPUnion.ProjectLighthouse.StorableLists.Stores; using LBPUnion.ProjectLighthouse.StorableLists.Stores;
using LBPUnion.ProjectLighthouse.Types.Activity; using LBPUnion.ProjectLighthouse.Types.Activity;
using LBPUnion.ProjectLighthouse.Types.Entities.Token; using LBPUnion.ProjectLighthouse.Types.Entities.Token;
using LBPUnion.ProjectLighthouse.Types.Levels; using LBPUnion.ProjectLighthouse.Types.Levels;
using LBPUnion.ProjectLighthouse.Types.Logging;
using LBPUnion.ProjectLighthouse.Types.Serialization.Activity; using LBPUnion.ProjectLighthouse.Types.Serialization.Activity;
using LBPUnion.ProjectLighthouse.Types.Users; using LBPUnion.ProjectLighthouse.Types.Users;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -121,7 +123,7 @@ public class ActivityController : ControllerBase
dto.Activity.Type != EventType.AddLevelToPlaylist); dto.Activity.Type != EventType.AddLevelToPlaylist);
} }
Console.WriteLine(predicate); Logger.Debug(predicate.ToString(), LogArea.Activity);
dtoQuery = dtoQuery.Where(predicate); dtoQuery = dtoQuery.Where(predicate);
@ -281,16 +283,16 @@ public class ActivityController : ControllerBase
{ {
foreach (OuterActivityGroup outer in outerGroups) foreach (OuterActivityGroup outer in outerGroups)
{ {
Console.WriteLine(@$"Outer group key: {outer.Key}"); Logger.Debug(@$"Outer group key: {outer.Key}", LogArea.Activity);
List<IGrouping<InnerActivityGroup, ActivityDto>> itemGroup = outer.Groups; List<IGrouping<InnerActivityGroup, ActivityDto>> itemGroup = outer.Groups;
foreach (IGrouping<InnerActivityGroup, ActivityDto> item in itemGroup) foreach (IGrouping<InnerActivityGroup, ActivityDto> item in itemGroup)
{ {
Console.WriteLine( Logger.Debug(
@$" Inner group key: TargetId={item.Key.TargetId}, UserId={item.Key.UserId}, Type={item.Key.Type}"); @$" Inner group key: TargetId={item.Key.TargetId}, UserId={item.Key.UserId}, Type={item.Key.Type}", LogArea.Activity);
foreach (ActivityDto activity in item) foreach (ActivityDto activity in item)
{ {
Console.WriteLine( Logger.Debug(
@$" Activity: {activity.GroupType}, Timestamp: {activity.Activity.Timestamp}, UserId: {activity.Activity.UserId}, EventType: {activity.Activity.Type}, TargetId: {activity.TargetId}"); @$" Activity: {activity.GroupType}, Timestamp: {activity.Activity.Timestamp}, UserId: {activity.Activity.UserId}, EventType: {activity.Activity.Type}, TargetId: {activity.TargetId}", LogArea.Activity);
} }
} }
} }

22
ProjectLighthouse/Types/Activity/ActivityEntityEventHandler.cs
View file

@ -2,12 +2,14 @@
using System; using System;
using System.Linq; using System.Linq;
using LBPUnion.ProjectLighthouse.Database; using LBPUnion.ProjectLighthouse.Database;
using LBPUnion.ProjectLighthouse.Logging;
using LBPUnion.ProjectLighthouse.Types.Entities.Activity; using LBPUnion.ProjectLighthouse.Types.Entities.Activity;
using LBPUnion.ProjectLighthouse.Types.Entities.Interaction; using LBPUnion.ProjectLighthouse.Types.Entities.Interaction;
using LBPUnion.ProjectLighthouse.Types.Entities.Level; using LBPUnion.ProjectLighthouse.Types.Entities.Level;
using LBPUnion.ProjectLighthouse.Types.Entities.Profile; using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
using LBPUnion.ProjectLighthouse.Types.Entities.Website; using LBPUnion.ProjectLighthouse.Types.Entities.Website;
using LBPUnion.ProjectLighthouse.Types.Levels; using LBPUnion.ProjectLighthouse.Types.Levels;
using LBPUnion.ProjectLighthouse.Types.Logging;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
#if DEBUG #if DEBUG
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
@ -20,7 +22,7 @@ public class ActivityEntityEventHandler : IEntityEventHandler
{ {
public void OnEntityInserted<T>(DatabaseContext database, T entity) where T : class public void OnEntityInserted<T>(DatabaseContext database, T entity) where T : class
{ {
Console.WriteLine($@"OnEntityInserted: {entity.GetType().Name}"); Logger.Debug($@"OnEntityInserted: {entity.GetType().Name}", LogArea.Activity);
ActivityEntity? activity = entity switch ActivityEntity? activity = entity switch
{ {
SlotEntity slot => slot.Type switch SlotEntity slot => slot.Type switch
@ -125,7 +127,7 @@ public class ActivityEntityEventHandler : IEntityEventHandler
{ {
if (activity == null) return; if (activity == null) return;
Console.WriteLine("Inserting activity: " + activity.GetType().Name); Logger.Debug("Inserting activity: " + activity.GetType().Name, LogArea.Activity);
activity.Timestamp = DateTime.UtcNow; activity.Timestamp = DateTime.UtcNow;
database.Activities.Add(activity); database.Activities.Add(activity);
@ -145,11 +147,11 @@ public class ActivityEntityEventHandler : IEntityEventHandler
object? newVal = propInfo.GetValue(currentEntity); object? newVal = propInfo.GetValue(currentEntity);
if ((origVal == null && newVal == null) || (origVal != null && newVal != null && origVal.Equals(newVal))) continue; if ((origVal == null && newVal == null) || (origVal != null && newVal != null && origVal.Equals(newVal))) continue;
Console.WriteLine($@"Value for {propInfo.Name} changed"); Logger.Debug($@"Value for {propInfo.Name} changed", LogArea.Activity);
Console.WriteLine($@"Orig val: {origVal?.ToString() ?? "null"}"); Logger.Debug($@"Orig val: {origVal?.ToString() ?? "null"}", LogArea.Activity);
Console.WriteLine($@"New val: {newVal?.ToString() ?? "null"}"); Logger.Debug($@"New val: {newVal?.ToString() ?? "null"}", LogArea.Activity);
} }
Console.WriteLine($@"OnEntityChanged: {currentEntity.GetType().Name}"); Logger.Debug($@"OnEntityChanged: {currentEntity.GetType().Name}", LogArea.Activity);
#endif #endif
ActivityEntity? activity = null; ActivityEntity? activity = null;
@ -242,12 +244,12 @@ public class ActivityEntityEventHandler : IEntityEventHandler
int[] newSlots = playlist.SlotIds; int[] newSlots = playlist.SlotIds;
int[] oldSlots = oldPlaylist.SlotIds; int[] oldSlots = oldPlaylist.SlotIds;
Console.WriteLine($@"Old playlist slots: {string.Join(",", oldSlots)}"); Logger.Debug($@"Old playlist slots: {string.Join(",", oldSlots)}", LogArea.Activity);
Console.WriteLine($@"New playlist slots: {string.Join(",", newSlots)}"); Logger.Debug($@"New playlist slots: {string.Join(",", newSlots)}", LogArea.Activity);
int[] addedSlots = newSlots.Except(oldSlots).ToArray(); int[] addedSlots = newSlots.Except(oldSlots).ToArray();
Console.WriteLine($@"Added playlist slots: {string.Join(",", addedSlots)}"); Logger.Debug($@"Added playlist slots: {string.Join(",", addedSlots)}", LogArea.Activity);
// If no new level have been added // If no new level have been added
if (addedSlots.Length == 0) break; if (addedSlots.Length == 0) break;
@ -275,7 +277,7 @@ public class ActivityEntityEventHandler : IEntityEventHandler
public void OnEntityDeleted<T>(DatabaseContext database, T entity) where T : class public void OnEntityDeleted<T>(DatabaseContext database, T entity) where T : class
{ {
Console.WriteLine($@"OnEntityDeleted: {entity.GetType().Name}"); Logger.Debug($@"OnEntityDeleted: {entity.GetType().Name}", LogArea.Activity);
ActivityEntity? activity = entity switch ActivityEntity? activity = entity switch
{ {
HeartedLevelEntity heartedLevel => heartedLevel.Slot.Type switch HeartedLevelEntity heartedLevel => heartedLevel.Slot.Type switch

1
ProjectLighthouse/Types/Logging/LogArea.cs
View file

@ -28,4 +28,5 @@ public enum LogArea
Email, Email,
Serialization, Serialization,
Synchronization, Synchronization,
Activity,
} }

8
ProjectLighthouse/Types/Serialization/Activity/Events/GameEvent.cs
View file

@ -6,9 +6,11 @@ using System.Threading.Tasks;
using System.Xml.Serialization; using System.Xml.Serialization;
using LBPUnion.ProjectLighthouse.Database; using LBPUnion.ProjectLighthouse.Database;
using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Logging;
using LBPUnion.ProjectLighthouse.Types.Activity; using LBPUnion.ProjectLighthouse.Types.Activity;
using LBPUnion.ProjectLighthouse.Types.Entities.Activity; using LBPUnion.ProjectLighthouse.Types.Entities.Activity;
using LBPUnion.ProjectLighthouse.Types.Entities.Profile; using LBPUnion.ProjectLighthouse.Types.Entities.Profile;
using LBPUnion.ProjectLighthouse.Types.Logging;
using LBPUnion.ProjectLighthouse.Types.Serialization.Review; using LBPUnion.ProjectLighthouse.Types.Serialization.Review;
namespace LBPUnion.ProjectLighthouse.Types.Serialization.Activity.Events; namespace LBPUnion.ProjectLighthouse.Types.Serialization.Activity.Events;
@ -46,7 +48,9 @@ public class GameEvent : ILbpSerializable, INeedsPreparationForSerialization
protected async Task PrepareSerialization(DatabaseContext database) protected async Task PrepareSerialization(DatabaseContext database)
{ {
Console.WriteLine($@"EVENT SERIALIZATION!! {this.UserId} - {this.GetHashCode()}"); #if DEBUG
Logger.Debug($@"EVENT SERIALIZATION!! userId: {this.UserId} - hashCode: {this.GetHashCode()}", LogArea.Activity);
#endif
UserEntity user = await database.Users.FindAsync(this.UserId); UserEntity user = await database.Users.FindAsync(this.UserId);
if (user == null) return; if (user == null) return;
this.Username = user.Username; this.Username = user.Username;
@ -114,7 +118,7 @@ public class GameEvent : ILbpSerializable, INeedsPreparationForSerialization
{ {
if (!IsValidActivity(activity.Activity)) if (!IsValidActivity(activity.Activity))
{ {
Console.WriteLine(@"Invalid Activity: " + activity.Activity.ActivityId); Logger.Error(@"Invalid Activity: " + activity.Activity.ActivityId, LogArea.Activity);
return null; return null;
} }