From bf8e810f27857a162e7ed6e247a4b46e3fe1ecbf Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 26 Oct 2018 17:55:59 +0200 Subject: [PATCH] Fix fallback errore gestione log mitigato --- SteamWareLib/devicesAuthProxy.cs | 2 +- SteamWareLib/logger.cs | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/SteamWareLib/devicesAuthProxy.cs b/SteamWareLib/devicesAuthProxy.cs index 393b757..83c3755 100644 --- a/SteamWareLib/devicesAuthProxy.cs +++ b/SteamWareLib/devicesAuthProxy.cs @@ -283,7 +283,7 @@ namespace SteamWare // calcolo il secret... DateTime adesso = DateTime.Now; string Secret = string.Format("{0}|{1}|{2}", email, DeviceName, adesso); - string devSecret = SteamCrypto.EncryptString(Secret, passphrase(memLayer.ML.CRS("CodModulo"), UserAuthKey)); + string devSecret = SteamCrypto.EncryptString(Secret, passphrase(memLayer.ML.confReadString("CodModulo"), UserAuthKey)); try { // registro chiave x il device diff --git a/SteamWareLib/logger.cs b/SteamWareLib/logger.cs index 389a23a..35355e4 100644 --- a/SteamWareLib/logger.cs +++ b/SteamWareLib/logger.cs @@ -57,7 +57,7 @@ namespace SteamWare _logMaxMb = 100; // di default 100 mb... try { - _doShrinkFolder = memLayer.ML.confReadBool("doShrinkFolder"); + _doShrinkFolder = memLayer.ML.CRB("doShrinkFolder"); } catch { @@ -128,6 +128,17 @@ namespace SteamWare string hVetoErrore = memLayer.ML.redHash("Logger:Veto:" + hKey); string hCountErrore = memLayer.ML.redHash("Logger:Counter:" + hKey); bool redisEnabled = memLayer.ML.confReadBool("cacheOnRedis"); + // verifico mitigazione + int logMitigSec = 30; + try + { + if (memLayer.ML.CRS("logMitigSec") != "") + { + logMitigSec = memLayer.ML.CRI("logMitigSec"); + } + } + catch + { } // verifico SE HO redis (in quel caso gli errori li loggo 1 volta poi metto un VETO ed un counter) if (redisEnabled) { @@ -140,7 +151,7 @@ namespace SteamWare else { // metto veto per TTL default... (durata std = 30 sec) - memLayer.ML.setRSV(hVetoErrore, DateTime.UtcNow.ToString(), 30); + memLayer.ML.setRSV(hVetoErrore, DateTime.UtcNow.ToString(), logMitigSec); // abilito log... needWrite = true; }