Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modifica modalità richiesta iniziale

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-09 14:06:13 +02:00
parent 70f896c7a8
commit e5e75f6098
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/IobFileEurom63.cs
+25 -10
View File
@@ -85,6 +85,25 @@ namespace IOB_WIN
}
}
/// <summary>
/// Effettua copia file richeiste + update timing
/// </summary>
/// <param name="connectSession"></param>
/// <param name="adesso"></param>
private void copyRequestFiles(Eurom63.Session connectSession, DateTime adesso)
{
// processo richiesta
processSessionFile(connectSession);
if (adesso > connectSession.SessionValidUntil)
{
connectSession.Active = !connectSession.Cycle;
}
connectSession.Passed = false;
connectSession.SessionStarted = adesso;
connectSession.SessionValidUntil = adesso.AddMinutes(connectSession.ValidityMinutes);
connectSession.RetryVeto = adesso.AddSeconds(connectSession.RetrySec);
}
#endregion Private Methods
#region Protected Methods
@@ -219,6 +238,11 @@ namespace IOB_WIN
connectSession.Active = connectSession.Cycle;
connectSession.Passed = true;
}
// verifico SE ci sia la richeista sennò la chiedo...
else if (!checkRequest(connectSession))
{
copyRequestFiles(connectSession, adesso);
}
// richiedo SE non ci fosse i dati CONNECT...
else
{
@@ -228,16 +252,7 @@ namespace IOB_WIN
{
// pulisco eventuali risp vecchie
cleanupResp(connectSession.SessionName);
// processo richiesta
processSessionFile(connectSession);
if (adesso > connectSession.SessionValidUntil)
{
connectSession.Active = !connectSession.Cycle;
}
connectSession.Passed = false;
connectSession.SessionStarted = adesso;
connectSession.SessionValidUntil = adesso.AddMinutes(connectSession.ValidityMinutes);
connectSession.RetryVeto = adesso.AddSeconds(connectSession.RetrySec);
copyRequestFiles(connectSession, adesso);
}
}
}
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=721']) {
withEnv(['NEXT_BUILD_NUMBER=722']) {
// 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.APP_NAME = 'MAPO-IOB-WIN'