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

Merge branch 'develop' into IobMan

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-12 12:22:19 +01:00
parent 0b8ab8f53e bfd03575f8
commit aba7dc9331
7 changed files with 100 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/App.config
+4
View File
@@ -16,6 +16,10 @@
<add key="BaseArg" value="MODE=MAN IOB=" />
<!--<add key="ArgsList" value="SIMUL_00,SIMUL_00" />-->
<add key="ArgsConfFile" value="/CONF/process.json" />
<!--Gestione riavvio periodico: ora e min di avvio, periodo ripetizione in minuti -->
<add key="fullRestartHour" value="0" />
<add key="fullRestartMinute" value="30" />
<add key="fullRestartIntervMin" value="1440" />
<!--gestione REDIS-->
<add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false" />
IOB-MAN/IOB-MAN.csproj
+8 -5
View File
@@ -47,8 +47,8 @@
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.9.2002.1287, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.9.2002.1287\lib\net40\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.9.2003.1292, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.9.2003.1292\lib\net40\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll</HintPath>
@@ -81,10 +81,13 @@
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare.IO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.IO.4.0.2002.731\lib\net462\SteamWare.IO.dll</HintPath>
<HintPath>..\packages\SteamWare.IO.4.0.2003.733\lib\net462\SteamWare.IO.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=4.0.2002.727, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.4.0.2002.727\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=4.0.2003.733, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.4.0.2003.733\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="Steamware.Scheduler, Version=4.0.2003.733, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Steamware.Scheduler.4.0.2003.733\lib\net462\Steamware.Scheduler.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
IOB-MAN/IOBManPanel.Designer.cs
Generated
+58 -54
View File
@@ -70,10 +70,10 @@
this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClose.BackColor = System.Drawing.SystemColors.WindowText;
this.btnClose.ForeColor = System.Drawing.Color.Yellow;
this.btnClose.Location = new System.Drawing.Point(11, 129);
this.btnClose.Margin = new System.Windows.Forms.Padding(2);
this.btnClose.Location = new System.Drawing.Point(14, 159);
this.btnClose.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(96, 26);
this.btnClose.Size = new System.Drawing.Size(128, 32);
this.btnClose.TabIndex = 70;
this.btnClose.Text = "Close SEL";
this.btnClose.UseVisualStyleBackColor = false;
@@ -92,10 +92,10 @@
this.lblVers,
this.tsProgBar,
this.tsslNumProc});
this.statusStrip1.Location = new System.Drawing.Point(0, 413);
this.statusStrip1.Location = new System.Drawing.Point(0, 509);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 10, 0);
this.statusStrip1.Size = new System.Drawing.Size(689, 22);
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 13, 0);
this.statusStrip1.Size = new System.Drawing.Size(919, 26);
this.statusStrip1.TabIndex = 82;
this.statusStrip1.Text = "statusStrip1";
//
@@ -103,24 +103,24 @@
//
this.lblApp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
this.lblApp.Name = "lblApp";
this.lblApp.Size = new System.Drawing.Size(12, 17);
this.lblApp.Size = new System.Drawing.Size(15, 20);
this.lblApp.Text = "-";
//
// lblVers
//
this.lblVers.Name = "lblVers";
this.lblVers.Size = new System.Drawing.Size(49, 17);
this.lblVers.Size = new System.Drawing.Size(61, 20);
this.lblVers.Text = "v 0.0.0.0";
//
// tsProgBar
//
this.tsProgBar.Name = "tsProgBar";
this.tsProgBar.Size = new System.Drawing.Size(75, 16);
this.tsProgBar.Size = new System.Drawing.Size(100, 18);
//
// tsslNumProc
//
this.tsslNumProc.Name = "tsslNumProc";
this.tsslNumProc.Size = new System.Drawing.Size(16, 17);
this.tsslNumProc.Size = new System.Drawing.Size(18, 20);
this.tsslNumProc.Text = "...";
//
// panel1
@@ -128,9 +128,9 @@
this.panel1.Controls.Add(this.menuStrip1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(2);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(689, 31);
this.panel1.Size = new System.Drawing.Size(919, 38);
this.panel1.TabIndex = 83;
//
// menuStrip1
@@ -140,8 +140,8 @@
this.processManagerToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(689, 24);
this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(919, 28);
this.menuStrip1.TabIndex = 82;
this.menuStrip1.Text = "menuStrip1";
//
@@ -152,27 +152,27 @@
this.forceCloseALLToolStripMenuItem,
this.updateIOBWINToolStripMenuItem});
this.processManagerToolStripMenuItem.Name = "processManagerToolStripMenuItem";
this.processManagerToolStripMenuItem.Size = new System.Drawing.Size(62, 20);
this.processManagerToolStripMenuItem.Size = new System.Drawing.Size(77, 24);
this.processManagerToolStripMenuItem.Text = "&Manage";
//
// reloadConfRestartToolStripMenuItem
//
this.reloadConfRestartToolStripMenuItem.Name = "reloadConfRestartToolStripMenuItem";
this.reloadConfRestartToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.reloadConfRestartToolStripMenuItem.Size = new System.Drawing.Size(236, 26);
this.reloadConfRestartToolStripMenuItem.Text = "&Reload conf + Restart";
this.reloadConfRestartToolStripMenuItem.Click += new System.EventHandler(this.reloadConfRestartToolStripMenuItem_Click);
//
// forceCloseALLToolStripMenuItem
//
this.forceCloseALLToolStripMenuItem.Name = "forceCloseALLToolStripMenuItem";
this.forceCloseALLToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.forceCloseALLToolStripMenuItem.Size = new System.Drawing.Size(236, 26);
this.forceCloseALLToolStripMenuItem.Text = "&Force Close ALL";
this.forceCloseALLToolStripMenuItem.Click += new System.EventHandler(this.forceCloseALLToolStripMenuItem_Click);
//
// updateIOBWINToolStripMenuItem
//
this.updateIOBWINToolStripMenuItem.Name = "updateIOBWINToolStripMenuItem";
this.updateIOBWINToolStripMenuItem.Size = new System.Drawing.Size(187, 22);
this.updateIOBWINToolStripMenuItem.Size = new System.Drawing.Size(236, 26);
this.updateIOBWINToolStripMenuItem.Text = "Update IOB-&WIN";
this.updateIOBWINToolStripMenuItem.Click += new System.EventHandler(this.updateIOBWINToolStripMenuItem_Click);
//
@@ -180,10 +180,10 @@
//
this.btnMaximixeAll.BackColor = System.Drawing.SystemColors.Highlight;
this.btnMaximixeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.btnMaximixeAll.Location = new System.Drawing.Point(11, 57);
this.btnMaximixeAll.Margin = new System.Windows.Forms.Padding(2);
this.btnMaximixeAll.Location = new System.Drawing.Point(15, 70);
this.btnMaximixeAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnMaximixeAll.Name = "btnMaximixeAll";
this.btnMaximixeAll.Size = new System.Drawing.Size(96, 26);
this.btnMaximixeAll.Size = new System.Drawing.Size(128, 32);
this.btnMaximixeAll.TabIndex = 81;
this.btnMaximixeAll.Text = "Show ALL";
this.btnMaximixeAll.UseVisualStyleBackColor = false;
@@ -193,10 +193,10 @@
//
this.btnMinimizeAll.BackColor = System.Drawing.SystemColors.Highlight;
this.btnMinimizeAll.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.btnMinimizeAll.Location = new System.Drawing.Point(11, 87);
this.btnMinimizeAll.Margin = new System.Windows.Forms.Padding(2);
this.btnMinimizeAll.Location = new System.Drawing.Point(15, 107);
this.btnMinimizeAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnMinimizeAll.Name = "btnMinimizeAll";
this.btnMinimizeAll.Size = new System.Drawing.Size(96, 26);
this.btnMinimizeAll.Size = new System.Drawing.Size(128, 32);
this.btnMinimizeAll.TabIndex = 80;
this.btnMinimizeAll.Text = "Hide ALL";
this.btnMinimizeAll.UseVisualStyleBackColor = false;
@@ -206,16 +206,16 @@
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F));
this.tableLayoutPanel1.Controls.Add(this.panel2, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.dgvManagedItems, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 31);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2);
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 38);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(689, 382);
this.tableLayoutPanel1.Size = new System.Drawing.Size(919, 471);
this.tableLayoutPanel1.TabIndex = 85;
//
// panel2
@@ -232,10 +232,10 @@
this.panel2.Controls.Add(this.btnMinimizeAll);
this.panel2.Controls.Add(this.btnMaximixeAll);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(571, 2);
this.panel2.Margin = new System.Windows.Forms.Padding(2);
this.panel2.Location = new System.Drawing.Point(762, 2);
this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(116, 378);
this.panel2.Size = new System.Drawing.Size(154, 467);
this.panel2.TabIndex = 85;
//
// btnStartSel
@@ -243,10 +243,10 @@
this.btnStartSel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnStartSel.BackColor = System.Drawing.Color.Green;
this.btnStartSel.ForeColor = System.Drawing.Color.Yellow;
this.btnStartSel.Location = new System.Drawing.Point(10, 159);
this.btnStartSel.Margin = new System.Windows.Forms.Padding(2);
this.btnStartSel.Location = new System.Drawing.Point(12, 196);
this.btnStartSel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnStartSel.Name = "btnStartSel";
this.btnStartSel.Size = new System.Drawing.Size(96, 26);
this.btnStartSel.Size = new System.Drawing.Size(128, 32);
this.btnStartSel.TabIndex = 88;
this.btnStartSel.Text = "Start SEL";
this.btnStartSel.UseVisualStyleBackColor = false;
@@ -254,9 +254,10 @@
//
// btnMoreTOut
//
this.btnMoreTOut.Location = new System.Drawing.Point(81, 306);
this.btnMoreTOut.Location = new System.Drawing.Point(108, 377);
this.btnMoreTOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMoreTOut.Name = "btnMoreTOut";
this.btnMoreTOut.Size = new System.Drawing.Size(25, 23);
this.btnMoreTOut.Size = new System.Drawing.Size(33, 28);
this.btnMoreTOut.TabIndex = 87;
this.btnMoreTOut.Text = "+";
this.btnMoreTOut.UseVisualStyleBackColor = true;
@@ -265,9 +266,10 @@
//
// txtTOutAutoCheck
//
this.txtTOutAutoCheck.Location = new System.Drawing.Point(11, 306);
this.txtTOutAutoCheck.Location = new System.Drawing.Point(15, 377);
this.txtTOutAutoCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtTOutAutoCheck.Name = "txtTOutAutoCheck";
this.txtTOutAutoCheck.Size = new System.Drawing.Size(64, 20);
this.txtTOutAutoCheck.Size = new System.Drawing.Size(84, 22);
this.txtTOutAutoCheck.TabIndex = 86;
this.txtTOutAutoCheck.Visible = false;
this.txtTOutAutoCheck.TextChanged += new System.EventHandler(this.txtTOutAutoCheck_TextChanged);
@@ -277,9 +279,10 @@
this.chkAutoRestart.AutoSize = true;
this.chkAutoRestart.Checked = true;
this.chkAutoRestart.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkAutoRestart.Location = new System.Drawing.Point(11, 275);
this.chkAutoRestart.Location = new System.Drawing.Point(15, 338);
this.chkAutoRestart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chkAutoRestart.Name = "chkAutoRestart";
this.chkAutoRestart.Size = new System.Drawing.Size(85, 17);
this.chkAutoRestart.Size = new System.Drawing.Size(109, 21);
this.chkAutoRestart.TabIndex = 85;
this.chkAutoRestart.Text = "Auto Restart";
this.chkAutoRestart.UseVisualStyleBackColor = true;
@@ -290,10 +293,10 @@
this.btnOpenAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnOpenAll.BackColor = System.Drawing.SystemColors.ButtonFace;
this.btnOpenAll.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
this.btnOpenAll.Location = new System.Drawing.Point(11, 12);
this.btnOpenAll.Margin = new System.Windows.Forms.Padding(2);
this.btnOpenAll.Location = new System.Drawing.Point(14, 15);
this.btnOpenAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnOpenAll.Name = "btnOpenAll";
this.btnOpenAll.Size = new System.Drawing.Size(96, 26);
this.btnOpenAll.Size = new System.Drawing.Size(128, 32);
this.btnOpenAll.TabIndex = 84;
this.btnOpenAll.Text = "Open ALL";
this.btnOpenAll.UseVisualStyleBackColor = false;
@@ -303,10 +306,10 @@
//
this.btnRestartAll.BackColor = System.Drawing.SystemColors.ControlDarkDark;
this.btnRestartAll.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.btnRestartAll.Location = new System.Drawing.Point(11, 244);
this.btnRestartAll.Margin = new System.Windows.Forms.Padding(2);
this.btnRestartAll.Location = new System.Drawing.Point(15, 300);
this.btnRestartAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnRestartAll.Name = "btnRestartAll";
this.btnRestartAll.Size = new System.Drawing.Size(96, 26);
this.btnRestartAll.Size = new System.Drawing.Size(128, 32);
this.btnRestartAll.TabIndex = 83;
this.btnRestartAll.Text = "Restart ALL";
this.btnRestartAll.UseVisualStyleBackColor = false;
@@ -316,10 +319,10 @@
//
this.btnCloseAll.BackColor = System.Drawing.SystemColors.ControlDarkDark;
this.btnCloseAll.ForeColor = System.Drawing.SystemColors.ControlLightLight;
this.btnCloseAll.Location = new System.Drawing.Point(11, 214);
this.btnCloseAll.Margin = new System.Windows.Forms.Padding(2);
this.btnCloseAll.Location = new System.Drawing.Point(15, 263);
this.btnCloseAll.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(96, 26);
this.btnCloseAll.Size = new System.Drawing.Size(128, 32);
this.btnCloseAll.TabIndex = 82;
this.btnCloseAll.Text = "Close ALL";
this.btnCloseAll.UseVisualStyleBackColor = false;
@@ -334,11 +337,12 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.dgvManagedItems.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
this.dgvManagedItems.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvManagedItems.Location = new System.Drawing.Point(3, 3);
this.dgvManagedItems.Location = new System.Drawing.Point(4, 4);
this.dgvManagedItems.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dgvManagedItems.Name = "dgvManagedItems";
this.dgvManagedItems.ReadOnly = true;
this.dgvManagedItems.RowHeadersWidth = 51;
this.dgvManagedItems.Size = new System.Drawing.Size(563, 376);
this.dgvManagedItems.Size = new System.Drawing.Size(751, 463);
this.dgvManagedItems.TabIndex = 76;
this.dgvManagedItems.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManagedItems_CellDoubleClick);
this.dgvManagedItems.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgvManagedItems_CellFormatting);
@@ -354,17 +358,17 @@
//
// IOBManPanel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ControlLight;
this.ClientSize = new System.Drawing.Size(689, 435);
this.ClientSize = new System.Drawing.Size(919, 535);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.statusStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.IsMdiContainer = true;
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(2);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "IOBManPanel";
this.Text = "IOB MANAGER";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.IOBManPanel_FormClosing);
IOB-MAN/IOBManPanel.cs
+22 -2
View File
@@ -1,4 +1,6 @@
using Newtonsoft.Json;
using Steamware.Scheduler;
using SteamWare.IO;
using SteamWare.Logger;
using System;
using System.Collections.Generic;
@@ -32,7 +34,6 @@ namespace IOB_MAN
/// Context x sync thread
/// </summary>
private readonly SynchronizationContext synchronizationContext;
/// <summary>
/// Totale processi avviati
/// </summary>
@@ -121,6 +122,19 @@ namespace IOB_MAN
UI_Timer.Start();
forceCheckTimer.Interval = forceCheckPeriod;
forceCheckTimer.Start();
// avvio il task con apposita classe Steamware... da 00:30
int fullRestartHour = memLayer.ML.CRI("fullRestartHour");
int fullRestartMinute = memLayer.ML.CRI("fullRestartMinute");
int fullRestartIntervMin = memLayer.ML.CRI("fullRestartIntervMin");
TaskSched.IntervalInMinutes(fullRestartHour, fullRestartMinute, fullRestartIntervMin, () =>
{
// eseguo nel contesto di sincronizzazione
synchronizationContext.Post(new SendOrPostCallback(o =>
{
// effettuo reload conf e restart
reloadConfAndRestart();
}), "");
});
}
private void preInit()
@@ -957,6 +971,13 @@ namespace IOB_MAN
}
private void reloadConfRestartToolStripMenuItem_Click(object sender, EventArgs e)
{
reloadConfAndRestart();
}
/// <summary>
/// Effettua chiusura completa + rilettura conf + riavvio
/// </summary>
private void reloadConfAndRestart()
{
// per iscurezza chiudo tutto
closeAllChild(true);
@@ -1093,7 +1114,6 @@ namespace IOB_MAN
}
updateStatus();
}
}
}
IOB-MAN/IOBManPanel.resx
+3
View File
@@ -126,6 +126,9 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>420, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>420, 17</value>
</metadata>
<metadata name="UI_Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>535, 17</value>
</metadata>
IOB-MAN/packages.config
+4 -3
View File
@@ -2,7 +2,7 @@
<packages>
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net461" />
<package id="DnsClient" version="1.2.0" targetFramework="net461" />
<package id="MapoSDK" version="6.9.2002.1287" targetFramework="net461" />
<package id="MapoSDK" version="6.9.2003.1292" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.2" targetFramework="net461" />
<package id="MongoDB.Driver" version="2.10.2" targetFramework="net461" />
<package id="MongoDB.Driver.Core" version="2.10.2" targetFramework="net461" />
@@ -17,8 +17,9 @@
<package id="SharpZipLib" version="1.2.0" targetFramework="net461" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net461" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net461" />
<package id="SteamWare.IO" version="4.0.2002.731" targetFramework="net462" />
<package id="SteamWare.Logger" version="4.0.2002.727" targetFramework="net462" />
<package id="SteamWare.IO" version="4.0.2003.733" targetFramework="net462" />
<package id="SteamWare.Logger" version="4.0.2003.733" targetFramework="net462" />
<package id="Steamware.Scheduler" version="4.0.2003.733" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net461" />
<package id="System.IO.Pipelines" version="4.7.0" targetFramework="net461" />
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=691']) {
withEnv(['NEXT_BUILD_NUMBER=693']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'