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

Merge branch 'develop' into IOB-NET

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-30 18:52:25 +01:00
parent 121cf57b9c 0a01db8765
commit 0154019838
5 changed files with 1121 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.cs
+4 -2
View File
@@ -807,8 +807,8 @@ namespace IOB_MAN
// eseguo nel contesto di sincronizzazione
synchronizationContext.Post(new SendOrPostCallback(o =>
{
// effettuo reload conf e restart
reloadConfAndRestart();
// effettuo reload conf e restart
reloadConfAndRestart();
}), "");
});
}
@@ -1028,6 +1028,7 @@ namespace IOB_MAN
/// </summary>
private void reloadConfAndRestart()
{
utils.lgInfo("Call reloadConfAndRestart: start full reload");
// per sicurezza chiudo tutto
closeAllChild(true);
Thread.Sleep(1000);
@@ -1037,6 +1038,7 @@ namespace IOB_MAN
Thread.Sleep(500);
// riapro
apriChild();
utils.lgInfo("Call reloadConfAndRestart: completed full reload");
}
private void reloadConfRestartToolStripMenuItem_Click(object sender, EventArgs e)
IOB-WIN/AdapterForm.cs
+1 -1
View File
@@ -1048,7 +1048,7 @@ namespace IOB_WIN
private void loadIniFile(string iniConfFile)
{
// out di cosa faccio...
displayTaskAndLog(string.Format("Loading iniConfFile: {0}", iniConfFile));
displayTaskAndLog($"[STARTUP] Loading iniConfFile: {iniConfFile}");
// leggo file
IniFile fIni = new IniFile(iniConfFile);
IOB-WIN/IobGeneric.cs
+4 -4
View File
@@ -4388,7 +4388,7 @@ namespace IOB_WIN
if (forceDequeue)
{
// svuoto le code dei valori letti e non ancora trasmessi...
parentForm.displayTaskAndLog("Svuotamento FORZATO coda segnali...");
parentForm.displayTaskAndLog("[CLOSING] Svuotamento FORZATO coda segnali...");
while (QueueIN.Count > 0)
{
// INVIO COMUNQUE...!!!
@@ -4396,7 +4396,7 @@ namespace IOB_WIN
QueueIN.TryDequeue(out valore);
sendToMoonPro(urlType.SignIN, valore);
}
parentForm.displayTaskAndLog("Svuotamento FORZATO coda FluxLOG...");
parentForm.displayTaskAndLog("[CLOSING] Svuotamento FORZATO coda FluxLOG...");
// se ho + di 2 elementi in coda --> uso invio JSON in blocco...
if (QueueFLog.Count > minJsonData)
{
@@ -4438,10 +4438,10 @@ namespace IOB_WIN
}
}
}
parentForm.displayTaskAndLog("Stopping adapter...");
parentForm.displayTaskAndLog("[STOP] Stopping adapter...");
adpTryRestart = false;
parentForm.displayTaskAndLog("Stopping adapter - last periodic data read...");
parentForm.displayTaskAndLog("[STOP] Stopping adapter - last periodic data read...");
// chiudo la connessione all'adapter...
tryDisconnect();
IOB-WIN/MainForm.cs
+1111 -1065
View File
File diff suppressed because it is too large Load Diff
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=751']) {
withEnv(['NEXT_BUILD_NUMBER=752']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'