From 7f0deddc489bde7e90b6d7ebd6af54c33c80c505 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 16 Oct 2019 18:30:55 +0200 Subject: [PATCH] update x init logger --- Jenkinsfile | 2 +- SteamWareLib/example-config-table.txt | 9 ++------- SteamWareLib/logger.cs | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e55092..64d58a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=675']) { + withEnv(['NEXT_BUILD_NUMBER=676']) { // env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '3.3.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/SteamWareLib/example-config-table.txt b/SteamWareLib/example-config-table.txt index bc81d7c..5244f15 100644 --- a/SteamWareLib/example-config-table.txt +++ b/SteamWareLib/example-config-table.txt @@ -6,16 +6,13 @@ _emailPwd drmfsls16 drmfsls16 drmfsls16 _emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com _enableSSL true true true _fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg -_logDir ~/logs/ ~/logs/ Cartella LOG -_loginPages jumper#forceUser#login#UserAdmin#default#registerUser#about#contact#CondizioniServizio jumper#forceUser#login#UserAdmin#default#registerUser#about#contact#CondizioniServizio Pagine x Login -_logLevel 6 6 Livello verbosità log -_logMaxMb 30 30 massima dim cartella log _righeDataGrid 30 30 Num righe datagrid std _righeDataGridAnagr 20 20 Num righe datagrid anagrafiche _righeDataGridLong 30 30 Num righe datagrid long _righeDataGridMed 15 15 Num righe datagrid med _righeDataGridShort 10 10 Num righe datagrid short _smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com +_useAIMSmtp false false impiego client posta elettronica alternativo _useAuthSmtp true true true AuthCookieName admodellingAuth admodellingAuth Cookie applicativo autoConfCmd true true Conferma automatica comandi barcode @@ -26,10 +23,8 @@ cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco d enableCookie true true Abilitazione uso cookie enableLogOut true false Abilita button logout COMPLETO in alto a sx enablePlain true true Abilitazione decode plain -logMitigSec 60 60 Mitigazione scrittura log (per chiave uguale ogni 60 sec maxAuth 1000 1000 num auth minimo per NON consumare tokens serializeSession true true Serializzazione valori in sessione (REDIS) SiteName iis02/test/admodelling iis02/test/admodelling Nome sito enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default -doShrinkFolder true true Imposta compressione area LOGS -_useAIMSmtp false false impiego client posta elettronica alternativo \ No newline at end of file +doShrinkFolder true true Imposta compressione area LOGS \ No newline at end of file diff --git a/SteamWareLib/logger.cs b/SteamWareLib/logger.cs index bae0be1..932c4cd 100644 --- a/SteamWareLib/logger.cs +++ b/SteamWareLib/logger.cs @@ -150,9 +150,9 @@ namespace SteamWare int logMitigSec = 30; try { - if (memLayer.ML.CRS("logMitigSec") != "") + if (memLayer.ML.confReadString("logMitigSec") != "") { - logMitigSec = memLayer.ML.CRI("logMitigSec"); + logMitigSec = memLayer.ML.confReadInt("logMitigSec"); } } catch