diff --git a/Jenkinsfile b/Jenkinsfile index 1f304eda..1a1611d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1281']) { + withEnv(['NEXT_BUILD_NUMBER=1282']) { // env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs index 7a259209..733b07c1 100644 --- a/MP-IO/Controllers/IOBController.cs +++ b/MP-IO/Controllers/IOBController.cs @@ -195,7 +195,7 @@ namespace MP_IO.Controllers } catch (Exception exc) { - logger.lg.scriviLog(string.Format("Errore in flog{0}{1}", Environment.NewLine, exc)); + logger.lg.scriviLog($"Errore in flog{Environment.NewLine}{exc}"); answ = "NO"; } return answ; diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs index 2c1ebcb4..4c5cdd39 100644 --- a/MapoDb/DataLayer.cs +++ b/MapoDb/DataLayer.cs @@ -816,7 +816,10 @@ namespace MapoDb { if (idxMacchina != "" && valore != "") { - DataLayer.obj.taFL.InsNew(idxMacchina, dataOraEvento, flux, valore, contatore); + // 2020.01.31 nuovo OBJ + DataLayer man = new DataLayer(); + man.taFL.InsNew(idxMacchina, dataOraEvento, flux, valore, contatore); + //DataLayer.obj.taFL.InsNew(idxMacchina, dataOraEvento, flux, valore, contatore); // registro in risposta che รจ andato tutto bene... answ = "OK"; } @@ -1712,7 +1715,10 @@ namespace MapoDb } else { - answTab = MapoDb.obj.taAnagSt.GetData(); + //2020.01.31 nuovo obj x evitare concorrenza + MapoDb man = new MapoDb(); + answTab = man.taAnagSt.GetData(); + //answTab = MapoDb.obj.taAnagSt.GetData(); // salvo in redis... rCall = JsonConvert.SerializeObject(answTab); int anagrCacheDur = memLayer.ML.CRI("anagrCacheDur"); @@ -2080,10 +2086,10 @@ namespace MapoDb bool answ = false; try { + // recupero con stored NUOVA... //2020.01.31 NUOVO oggetto singleton DataLayer man = new DataLayer(); datiProdAct = man.taStatoProd.GetData(idxMacchina, dataRif); - //// recupero con stored NUOVA... //datiProdAct = DataLayer.obj.taStatoProd.GetData(idxMacchina, dataRif); if (datiProdAct.Rows.Count > 0) { diff --git a/MapoDb/MapoDb.cs b/MapoDb/MapoDb.cs index 2eed9771..0d744945 100644 --- a/MapoDb/MapoDb.cs +++ b/MapoDb/MapoDb.cs @@ -459,7 +459,10 @@ namespace MapoDb logger.lg.scriviLog("Recupero currODLTab da DB!", tipoLog.INFO); try { - answ = DataLayer.obj.taODL.getByMacchina(idxMacchina); + //2020.01.31 nuovo obj x evitare singleton + DataLayer man = new DataLayer(); + answ = man.taODL.getByMacchina(idxMacchina); + //answ = DataLayer.obj.taODL.getByMacchina(idxMacchina); } catch (Exception exc) {