From cd4aaea09c0ef404ff8b925c4b44ac5e57481eea Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 28 Feb 2020 16:06:50 +0100 Subject: [PATCH] Gestione TTL conteggio doc in coda parametrica + nuova vers numb --- Jenkinsfile | 10 +--------- MP-MAG/Controllers/PrintQueueController.cs | 3 ++- MP-MAG/Web.config | 3 ++- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6132f20..4329321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,17 +11,9 @@ pipeline { stage('Checkout') { agent any steps { - /* build delle SteamWare libs! */ - /*build 'SteamWare/SteamWareLib'*/ - /* copio le libs...*/ - // step([$class: 'CopyArtifact', fingerprintArtifacts: true, projectName: 'Steamware/SteamWareLib', selector: [$class: 'WorkspaceSelector'], target: '../Steamware/SteamWareLib']) - - // mirroring directory x SteamWare Libs - // bat "robocopy /MIR ..\\..\\SteamWare\\SteamWareLib ..\\SteamWare\\SteamWareLib || EXIT /B 0" - /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=220']) { + withEnv(['NEXT_BUILD_NUMBER=221']) { // env.versionNumber = VersionNumber(versionNumberString : '1.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK' diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs index 4d2c3ef..7440d00 100644 --- a/MP-MAG/Controllers/PrintQueueController.cs +++ b/MP-MAG/Controllers/PrintQueueController.cs @@ -109,9 +109,10 @@ namespace MP_API.Controllers } else { + int ttlPrintCount = memLayer.ML.CRI("ttlPrintCount"); // recupero da dbe e salvo answ = countWaitingDb; - memLayer.ML.setRSV(redQueueCount, $"{answ}", 30); + memLayer.ML.setRSV(redQueueCount, $"{answ}", ttlPrintCount); } return answ; } diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config index 0729475..751dc68 100644 --- a/MP-MAG/Web.config +++ b/MP-MAG/Web.config @@ -9,7 +9,8 @@ - + +