diff --git a/Jenkinsfile b/Jenkinsfile index 83a1015..c67a807 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=673']) { + withEnv(['NEXT_BUILD_NUMBER=674']) { // 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/SteamWare.csproj b/SteamWareLib/SteamWare.csproj index 387d2b9..b0c04ad 100644 --- a/SteamWareLib/SteamWare.csproj +++ b/SteamWareLib/SteamWare.csproj @@ -228,6 +228,7 @@ + Always diff --git a/SteamWareLib/example-config-table.txt b/SteamWareLib/example-config-table.txt new file mode 100644 index 0000000..bc81d7c --- /dev/null +++ b/SteamWareLib/example-config-table.txt @@ -0,0 +1,35 @@ +# chiave valore valoreStd note +_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net +_allowForceUser true true abilita login forzato +_commonPages menu menu pagina comune +_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 +_useAuthSmtp true true true +AuthCookieName admodellingAuth admodellingAuth Cookie applicativo +autoConfCmd true true Conferma automatica comandi barcode +baseUrl http://iis02/test/admodelling http://iis02/test/admodelling URL base del sito +cacheValSec 60 60 Validità cache dati in gestore Barcode +cookieDayExp 365 365 Periodo validità cookie +cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati +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 diff --git a/SteamWareLib/logger.cs b/SteamWareLib/logger.cs index 932c4cd..bae0be1 100644 --- a/SteamWareLib/logger.cs +++ b/SteamWareLib/logger.cs @@ -150,9 +150,9 @@ namespace SteamWare int logMitigSec = 30; try { - if (memLayer.ML.confReadString("logMitigSec") != "") + if (memLayer.ML.CRS("logMitigSec") != "") { - logMitigSec = memLayer.ML.confReadInt("logMitigSec"); + logMitigSec = memLayer.ML.CRI("logMitigSec"); } } catch