T type logging

This commit is contained in:
Alex
2025-01-15 15:06:54 +00:00
parent f9f108448a
commit 8b3305efca
100 changed files with 1229 additions and 761 deletions
+3 -3
View File
@@ -1,19 +1,19 @@
using Core.Annotations;
using Core.Models.Eft.Profile;
using Core.Models.Utils;
using Core.Services;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class AchievementController
{
protected ILogger _logger;
protected ISptLogger<AchievementController> _logger;
protected DatabaseService _databaseService;
public AchievementController
(
ILogger logger,
ISptLogger<AchievementController> logger,
DatabaseService databaseService
)
{
+4 -5
View File
@@ -7,21 +7,20 @@ using Core.Models.Eft.Bot;
using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Tables;
using Core.Models.Eft.Match;
using Core.Models.Enums;
using Core.Models.Spt.Bots;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class BotController
{
protected ILogger _logger;
protected ISptLogger<BotController> _logger;
protected DatabaseService _databaseService;
protected BotGenerator _botGenerator;
@@ -32,7 +31,7 @@ public class BotController
protected MatchBotDeatilsCacheService _matchBotDeatilsCacheService;
protected LocalisationService _localisationService;
protected SeasonalEventService _seasonalEventService;
private readonly MatchBotDetailsCacheService _matchBotDetailsCacheService;
protected MatchBotDetailsCacheService _matchBotDetailsCacheService;
protected ProfileHelper _profileHelper;
protected ConfigServer _configServer;
protected ApplicationContext _applicationContext;
@@ -44,7 +43,7 @@ public class BotController
public BotController
(
ILogger logger,
ISptLogger<BotController> logger,
DatabaseService databaseService,
BotGenerator botGenerator,
BotHelper botHelper,
+5 -5
View File
@@ -1,7 +1,6 @@
using Core.Annotations;
using Core.Models.Logging;
using Core.Models.Spt.Logging;
using ILogger = Core.Models.Utils.ILogger;
using Core.Models.Utils;
using LogLevel = Core.Models.Spt.Logging.LogLevel;
namespace Core.Controllers;
@@ -9,10 +8,11 @@ namespace Core.Controllers;
[Injectable]
public class ClientLogController
{
private readonly ILogger _logger;
protected ISptLogger<ClientLogController> _logger;
public ClientLogController(
ILogger logger)
ISptLogger<ClientLogController> logger
)
{
_logger = logger;
}
@@ -45,7 +45,7 @@ public class ClientLogController
this._logger.Info(message);
break;
case LogLevel.CUSTOM:
this._logger.Info(message/* TODO: , color.ToString(), backgroundColor.ToString()*/);
this._logger.Info(message /* TODO: , color.ToString(), backgroundColor.ToString()*/);
break;
case LogLevel.DEBUG:
this._logger.Debug(message);
+4 -3
View File
@@ -7,11 +7,12 @@ using Core.Models.Eft.Hideout;
using Core.Models.Eft.ItemEvent;
using Core.Models.Eft.Profile;
using Core.Models.Enums;
using Core.Models.Utils;
using Core.Routers;
using Core.Servers;
using Core.Services;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
using Product = Core.Models.Eft.ItemEvent.Product;
namespace Core.Controllers;
@@ -19,7 +20,7 @@ namespace Core.Controllers;
[Injectable]
public class CustomizationController
{
protected ILogger _logger;
protected ISptLogger<CustomizationController> _logger;
protected EventOutputHolder _eventOutputHolder;
protected DatabaseService _databaseService;
protected SaveServer _saveServer;
@@ -29,7 +30,7 @@ public class CustomizationController
public CustomizationController
(
ILogger logger,
ISptLogger<CustomizationController> logger,
EventOutputHolder eventOutputHolder,
DatabaseService databaseService,
SaveServer saveServer,
+6 -6
View File
@@ -13,12 +13,12 @@ namespace Core.Controllers;
[Injectable]
public class DialogueController
{
private readonly DialogueHelper _dialogueHelper;
private readonly ProfileHelper _profileHelper;
private readonly ConfigServer _configServer;
private readonly SaveServer _saveServer;
private readonly List<IDialogueChatBot> _dialogueChatBots;
private readonly CoreConfig _coreConfig;
protected DialogueHelper _dialogueHelper;
protected ProfileHelper _profileHelper;
protected ConfigServer _configServer;
protected SaveServer _saveServer;
protected List<IDialogueChatBot> _dialogueChatBots;
protected CoreConfig _coreConfig;
public DialogueController(
DialogueHelper dialogueHelper,
+31 -30
View File
@@ -7,51 +7,52 @@ using Core.Models.Eft.Profile;
using Core.Models.Enums;
using Core.Models.External;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class GameController
{
private readonly ILogger _logger;
private readonly ConfigServer _configServer;
private readonly DatabaseService _databaseService;
protected ISptLogger<GameController> _logger;
protected ConfigServer _configServer;
protected DatabaseService _databaseService;
private readonly TimeUtil _timeUtil;
protected TimeUtil _timeUtil;
// private readonly PreSptModLoader _preSptModLoader;
private readonly HttpServerHelper _httpServerHelper;
private readonly InventoryHelper _inventoryHelper;
private readonly RandomUtil _randomUtil;
private readonly HideoutHelper _hideoutHelper;
private readonly ProfileHelper _profileHelper;
private readonly ProfileFixerService _profileFixerService;
private readonly LocalisationService _localisationService;
private readonly PostDbLoadService _postDbLoadService;
private readonly CustomLocationWaveService _customLocationWaveService;
private readonly OpenZoneService _openZoneService;
private readonly SeasonalEventService _seasonalEventService;
private readonly ItemBaseClassService _itemBaseClassService;
private readonly GiftService _giftService;
private readonly RaidTimeAdjustmentService _raidTimeAdjustmentService;
private readonly ProfileActivityService _profileActivityService;
private readonly ApplicationContext _applicationContext;
//private readonly PreSptModLoader preSptModLoader
private readonly ICloner _cloner;
// protected PreSptModLoader _preSptModLoader;
protected HttpServerHelper _httpServerHelper;
protected InventoryHelper _inventoryHelper;
protected RandomUtil _randomUtil;
protected HideoutHelper _hideoutHelper;
protected ProfileHelper _profileHelper;
protected ProfileFixerService _profileFixerService;
protected LocalisationService _localisationService;
protected PostDbLoadService _postDbLoadService;
protected CustomLocationWaveService _customLocationWaveService;
protected OpenZoneService _openZoneService;
protected SeasonalEventService _seasonalEventService;
protected ItemBaseClassService _itemBaseClassService;
protected GiftService _giftService;
protected RaidTimeAdjustmentService _raidTimeAdjustmentService;
protected ProfileActivityService _profileActivityService;
protected ApplicationContext _applicationContext;
//protected PreSptModLoader preSptModLoader
protected ICloner _cloner;
private readonly CoreConfig _coreConfig;
private readonly HttpConfig _httpConfig;
private readonly RagfairConfig _ragfairConfig;
private readonly HideoutConfig _hideoutConfig;
private readonly BotConfig _botConfig;
protected CoreConfig _coreConfig;
protected HttpConfig _httpConfig;
protected RagfairConfig _ragfairConfig;
protected HideoutConfig _hideoutConfig;
protected BotConfig _botConfig;
public GameController(
ILogger logger,
ISptLogger<GameController> logger,
ConfigServer configServer,
DatabaseService databaseService,
TimeUtil timeUtil,
+26 -25
View File
@@ -6,44 +6,45 @@ using Core.Models.Eft.Hideout;
using Core.Models.Eft.ItemEvent;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Routers;
using Core.Servers;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class HideoutController
{
private readonly ILogger _logger;
private readonly HashUtil _hashUtil;
private readonly TimeUtil _timeUtil;
private readonly DatabaseService _databaseService;
private readonly RandomUtil _randomUtil;
private readonly InventoryHelper _inventoryHelper;
private readonly ItemHelper _itemHelper;
private readonly SaveServer _saveServer;
private readonly PlayerService _playerService;
private readonly PresetHelper _presetHelper;
private readonly PaymentHelper _paymentHelper;
private readonly EventOutputHolder _eventOutputHolder;
private readonly HttpResponseUtil _httpResponseUtil;
private readonly ProfileHelper _profileHelper;
private readonly HideoutHelper _hideoutHelper;
private readonly ScavCaseRewardGenerator _scavCaseRewardGenerator;
private readonly LocalisationService _localisationService;
private readonly ProfileActivityService _profileActivityService;
private readonly FenceService _fenceService;
private readonly CircleOfCultistService _circleOfCultistService;
private readonly ICloner _cloner;
private readonly ConfigServer _configServer;
private readonly HideoutConfig _hideoutConfig;
protected ISptLogger<HideoutController> _logger;
protected HashUtil _hashUtil;
protected TimeUtil _timeUtil;
protected DatabaseService _databaseService;
protected RandomUtil _randomUtil;
protected InventoryHelper _inventoryHelper;
protected ItemHelper _itemHelper;
protected SaveServer _saveServer;
protected PlayerService _playerService;
protected PresetHelper _presetHelper;
protected PaymentHelper _paymentHelper;
protected EventOutputHolder _eventOutputHolder;
protected HttpResponseUtil _httpResponseUtil;
protected ProfileHelper _profileHelper;
protected HideoutHelper _hideoutHelper;
protected ScavCaseRewardGenerator _scavCaseRewardGenerator;
protected LocalisationService _localisationService;
protected ProfileActivityService _profileActivityService;
protected FenceService _fenceService;
protected CircleOfCultistService _circleOfCultistService;
protected ICloner _cloner;
protected ConfigServer _configServer;
protected HideoutConfig _hideoutConfig;
public HideoutController(
ILogger logger,
ISptLogger<HideoutController> logger,
HashUtil hashUtil,
TimeUtil timeUtil,
DatabaseService databaseService,
+4 -3
View File
@@ -4,16 +4,17 @@ using Core.Helpers;
using Core.Models.Eft.InRaid;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class InRaidController
{
protected ILogger _logger;
protected ISptLogger<InRaidController> _logger;
protected SaveServer _saveServer;
protected ProfileHelper _profileHelper;
protected LocalisationService _localisationService;
@@ -25,7 +26,7 @@ public class InRaidController
public InRaidController
(
ILogger logger,
ISptLogger<InRaidController> logger,
SaveServer saveServer,
ProfileHelper profileHelper,
LocalisationService localisationService,
+4 -3
View File
@@ -7,11 +7,12 @@ using Core.Models.Eft.Profile;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Spt.Mod;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using Core.Utils;
using Core.Utils.Extensions;
using ILogger = Core.Models.Utils.ILogger;
using Info = Core.Models.Eft.Profile.Info;
namespace Core.Controllers;
@@ -21,7 +22,7 @@ public class LauncherController
{
protected CoreConfig _coreConfig;
protected ILogger _logger;
protected ISptLogger<LauncherController> _logger;
protected HashUtil _hashUtil;
protected TimeUtil _timeUtil;
protected RandomUtil _randomUtil;
@@ -33,7 +34,7 @@ public class LauncherController
public LauncherController(
Models.Utils.ILogger logger,
ISptLogger<LauncherController> logger,
HashUtil hashUtil,
TimeUtil timeUtil,
RandomUtil randomUtil,
+7 -6
View File
@@ -2,22 +2,23 @@ using Core.Annotations;
using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Tables;
using Core.Models.Eft.Location;
using Core.Models.Utils;
using Core.Services;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class LocationController
{
private readonly ILogger _logger;
private readonly DatabaseService _databaseService;
private readonly AirdropService _airdropService;
private readonly ICloner _cloner;
protected ISptLogger<LocationController> _logger;
protected DatabaseService _databaseService;
protected AirdropService _airdropService;
protected ICloner _cloner;
public LocationController(
ILogger logger,
ISptLogger<LocationController> logger,
DatabaseService databaseService,
AirdropService airdropService,
ICloner cloner)
+1 -1
View File
@@ -9,7 +9,7 @@ namespace Core.Controllers;
[Injectable]
public class NoteController
{
private readonly EventOutputHolder _eventOutputHolder;
protected EventOutputHolder _eventOutputHolder;
public NoteController(
EventOutputHolder eventOutputHolder)
+2 -2
View File
@@ -7,8 +7,8 @@ namespace Core.Controllers;
[Injectable]
public class NotifierController
{
private readonly HttpServerHelper _httpServerHelper;
private readonly NotifierHelper _notifierHelper;
protected HttpServerHelper _httpServerHelper;
protected NotifierHelper _notifierHelper;
public NotifierController(
HttpServerHelper httpServerHelper,
+6 -5
View File
@@ -1,20 +1,21 @@
using Core.Annotations;
using Core.Helpers;
using Core.Models.Eft.Common;
using Core.Models.Utils;
using Core.Services;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class PresetController
{
private readonly ILogger _logger;
private readonly PresetHelper _presetHelper;
private readonly DatabaseService _databaseService;
protected ISptLogger<PresetController> _logger;
protected PresetHelper _presetHelper;
protected DatabaseService _databaseService;
public PresetController(
ILogger logger,
ISptLogger<PresetController> logger,
PresetHelper presetHelper,
DatabaseService databaseService
)
+10 -9
View File
@@ -5,29 +5,30 @@ using Core.Models.Eft.Common.Tables;
using Core.Models.Eft.Inventory;
using Core.Models.Eft.Prestige;
using Core.Models.Eft.Profile;
using Core.Models.Utils;
using Core.Routers;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class PrestigeController
{
private readonly ILogger _logger;
private readonly TimeUtil _timeUtil;
private readonly InventoryHelper _inventoryHelper;
private readonly ProfileHelper _profileHelper;
private readonly EventOutputHolder _eventOutputHolder;
private readonly CreateProfileService _createProfileService;
protected ISptLogger<PrestigeController> _logger;
protected TimeUtil _timeUtil;
protected InventoryHelper _inventoryHelper;
protected ProfileHelper _profileHelper;
protected EventOutputHolder _eventOutputHolder;
protected CreateProfileService _createProfileService;
private DatabaseService _databaseService;
private readonly ICloner _cloner;
protected ICloner _cloner;
public PrestigeController
(
ILogger logger,
ISptLogger<PrestigeController> logger,
TimeUtil timeUtil,
InventoryHelper inventoryHelper,
ProfileHelper profileHelper,
+6 -5
View File
@@ -5,6 +5,7 @@ using Core.Models.Eft.Common;
using Core.Models.Eft.Launcher;
using Core.Models.Eft.Profile;
using Core.Models.Enums;
using Core.Models.Utils;
using Core.Routers;
using Core.Servers;
using Core.Services;
@@ -16,7 +17,7 @@ namespace Core.Controllers;
[Injectable]
public class ProfileController
{
protected Models.Utils.ILogger _logger;
protected ISptLogger<ProfileController> _logger;
protected HashUtil _hashUtil;
protected ICloner _cloner;
@@ -26,22 +27,22 @@ public class ProfileController
protected ItemHelper _itemHelper;
protected ProfileFixerService _profileFixerService;
protected LocalisationService _localisationService;
private readonly CreateProfileService _createProfileService;
protected CreateProfileService _createProfileService;
protected SeasonalEventService _seasonalEventService;
// TODO: MailSendService mailSendService: MailSendService
protected PlayerScavGenerator _playerScavGenerator;
private readonly EventOutputHolder _eventOutputHolder;
protected EventOutputHolder _eventOutputHolder;
protected TraderHelper _traderHelper;
protected DialogueHelper _dialogueHelper;
protected QuestHelper _questHelper;
private readonly QuestRewardHelper _questRewardHelper;
protected QuestRewardHelper _questRewardHelper;
protected ProfileHelper _profileHelper;
public ProfileController(
Models.Utils.ILogger logger,
ISptLogger<ProfileController> logger,
HashUtil hashUtil,
ICloner cloner,
TimeUtil timeUtil,
+8 -7
View File
@@ -4,22 +4,23 @@ using Core.Models.Eft.Common;
using Core.Models.Eft.Common.Tables;
using Core.Models.Eft.ItemEvent;
using Core.Models.Eft.Quests;
using Core.Models.Utils;
using Core.Utils;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class QuestController
{
private readonly ILogger _logger;
private readonly TimeUtil _timeUtil;
private readonly HttpResponseUtil _httpResponseUtil;
private readonly QuestHelper _questHelper;
private readonly QuestRewardHelper _questRewardHelper;
protected ISptLogger<QuestController> _logger;
protected TimeUtil _timeUtil;
protected HttpResponseUtil _httpResponseUtil;
protected QuestHelper _questHelper;
protected QuestRewardHelper _questRewardHelper;
public QuestController(
ILogger logger,
ISptLogger<QuestController> logger,
TimeUtil timeUtil,
HttpResponseUtil httpResponseUtil,
QuestHelper questHelper,
+21 -20
View File
@@ -7,40 +7,41 @@ using Core.Models.Eft.Ragfair;
using Core.Models.Eft.Trade;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Routers;
using Core.Servers;
using Core.Services;
using Core.Utils;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class TradeController
{
private readonly ILogger _logger;
private readonly DatabaseService _databaseService;
private readonly EventOutputHolder _eventOutputHolder;
private readonly TradeHelper _tradeHelper;
private readonly TimeUtil _timeUtil;
private readonly HashUtil _hashUtil;
private readonly ItemHelper _itemHelper;
private readonly ProfileHelper _profileHelper;
private readonly RagfairOfferHelper _ragfairOfferHelper;
private readonly TraderHelper _traderHelper;
// private readonly RagfairServer _ragfairServer;
private readonly HttpResponseUtil _httpResponseUtil;
private readonly LocalisationService _localisationService;
private readonly RagfairPriceService _ragfairPriceService;
// private readonly MailSendService _mailSendService;
private readonly ConfigServer _configServer;
protected ISptLogger<TradeController> _logger;
protected DatabaseService _databaseService;
protected EventOutputHolder _eventOutputHolder;
protected TradeHelper _tradeHelper;
protected TimeUtil _timeUtil;
protected HashUtil _hashUtil;
protected ItemHelper _itemHelper;
protected ProfileHelper _profileHelper;
protected RagfairOfferHelper _ragfairOfferHelper;
protected TraderHelper _traderHelper;
// protected RagfairServer _ragfairServer;
protected HttpResponseUtil _httpResponseUtil;
protected LocalisationService _localisationService;
protected RagfairPriceService _ragfairPriceService;
// protected MailSendService _mailSendService;
protected ConfigServer _configServer;
private readonly RagfairConfig _ragfairConfig;
private readonly TraderConfig _traderConfig;
protected RagfairConfig _ragfairConfig;
protected TraderConfig _traderConfig;
public TradeController
(
ILogger logger,
ISptLogger<TradeController> logger,
DatabaseService databaseService,
EventOutputHolder eventOutputHolder,
TradeHelper tradeHelper,
+4 -3
View File
@@ -6,18 +6,19 @@ using Core.Models.Eft.Game;
using Core.Models.Eft.ItemEvent;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using Core.Utils;
using Core.Utils.Cloners;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class TraderController
{
private ILogger _logger;
private ISptLogger<TraderController> _logger;
private TimeUtil _timeUtil;
private DatabaseService _databaseService;
private TraderAssortHelper _traderAssortHelper;
@@ -36,7 +37,7 @@ public class TraderController
public TraderController
(
ILogger logger,
ISptLogger<TraderController> logger,
TimeUtil timeUtil,
DatabaseService databaseService,
TraderAssortHelper traderAssortHelper,
+10 -9
View File
@@ -5,26 +5,27 @@ using Core.Models.Eft.Weather;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Models.Spt.Weather;
using Core.Models.Utils;
using Core.Servers;
using Core.Services;
using ILogger = Core.Models.Utils.ILogger;
namespace Core.Controllers;
[Injectable]
public class WeatherController
{
private readonly ILogger _logger;
private readonly WeatherGenerator _weatherGenerator;
private readonly SeasonalEventService _seasonalEventService;
private readonly RaidWeatherService _raidWeatherService;
private readonly WeatherHelper _weatherHelper;
private readonly ConfigServer _configServer;
protected ISptLogger<WeatherController> _logger;
protected WeatherGenerator _weatherGenerator;
protected SeasonalEventService _seasonalEventService;
protected RaidWeatherService _raidWeatherService;
protected WeatherHelper _weatherHelper;
protected ConfigServer _configServer;
private readonly WeatherConfig _weatherConfig;
protected WeatherConfig _weatherConfig;
public WeatherController(
ILogger logger,
ISptLogger<WeatherController> logger,
WeatherGenerator weatherGenerator,
SeasonalEventService seasonalEventService,
RaidWeatherService raidWeatherService,
+1 -1
View File
@@ -9,7 +9,7 @@ namespace Core.Controllers;
[Injectable]
public class WishlistController
{
private readonly EventOutputHolder _eventOutputHolder;
protected EventOutputHolder _eventOutputHolder;
public WishlistController(
EventOutputHolder eventOutputHolder)