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

Merge branch 'develop' into current

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-10-09 14:34:13 +02:00
parent ebccbc0170 9fff07135d
commit a676bb374e
3 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN/DATA/CONF/EM63.json
+4 -4
View File
@@ -30,7 +30,7 @@
"Cycle": false,
"Description": "Check Connection Status",
"Max2Keep": 10,
"RetrySec": 30,
"RetrySec": 20,
"SessionName": "SESS0000",
"SessionType": "IsConnected",
"StepOrder": 0,
@@ -46,7 +46,7 @@
"Cycle": false,
"Description": "Get ID data",
"Max2Keep": 10,
"RetrySec": 30,
"RetrySec": 20,
"SessionName": "SESS0001",
"SessionType": "GetId",
"StepOrder": 1,
@@ -65,7 +65,7 @@
"2": {
"Cycle": false,
"Description": "Set DateTime on machine at start",
"RetrySec": 30,
"RetrySec": 20,
"SessionName": "SESS0002",
"SessionType": "SetDateTime",
"ValidityMinutes": 0.0,
@@ -85,7 +85,7 @@
"3": {
"Cycle": false,
"Description": "Abort All prev requests",
"RetrySec": 30,
"RetrySec": 20,
"SessionName": "SESS0003",
"SessionType": "AbortAll",
"ValidityMinutes": 0.0,
IOB-WIN/IobFileEurom63.cs
+47 -18
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
@@ -94,8 +113,10 @@ namespace IOB_WIN
var nextLevel = Eurom63.ComLevel.ChannelOk;
var connectSession = confE63.ActiveSessions[3];
processSession(nextLevel, ref connectSession);
#if false
// qui per sicurezza PULISCE TUTTO
cleanupFolder();
cleanupFolder();
#endif
}
/// <summary>
@@ -103,6 +124,23 @@ namespace IOB_WIN
/// </summary>
/// <param name="session"></param>
/// <returns></returns>
protected bool checkRequest(Eurom63.Session session)
{
bool answ = false;
string fileName = "";
if (session != null)
{
fileName = $"{BaseDir}\\{session.SessionName}.REQ";
answ = File.Exists(fileName);
}
return answ;
}
/// <summary>
/// Verifica se ci sia una risposta POSITIVA
/// </summary>
/// <param name="session"></param>
/// <returns></returns>
protected bool checkResp(Eurom63.Session session)
{
bool answ = false;
@@ -122,11 +160,6 @@ namespace IOB_WIN
rawData = textReader.ReadToEnd();
}
answ = rawData.Contains(session.RespOk);
if (!answ)
{
// se NON ok faccio pulizia...
cleanupSession(session);
}
}
}
return answ;
@@ -194,6 +227,7 @@ namespace IOB_WIN
{
// controllo esistenza directory --> segno connected...
connectionOk = Directory.Exists(BaseDir);
DateTime adesso = DateTime.Now;
if (connectionOk)
{
// verifico se ci sia risp CONNECT
@@ -207,25 +241,20 @@ 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
{
DateTime adesso = DateTime.Now;
// evito di richiedere SE non fosse già scaduta richiesta...
if (adesso > connectSession.RetryVeto)
if (adesso > connectSession.RetryVeto || !checkRequest(connectSession))
{
// 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=720']) {
withEnv(['NEXT_BUILD_NUMBER=723']) {
// 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'