From 23de8fef6c9d48b682548d23135f748a243980ee Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Dec 2019 12:30:13 +0100 Subject: [PATCH 1/3] Fix logica autorestart --- IOB-MAN/App.config | 1 + IOB-MAN/IOBManPanel.cs | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index b2e82429..f525d3ba 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -7,6 +7,7 @@ + diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index d9598430..7b897102 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -52,7 +52,10 @@ namespace IOB_MAN /// Path dell'exe da chiamare /// protected string TargetExe = ""; - + /// + /// Elapsed dell'autorestart + /// + protected DateTime autoRestartElapsed = DateTime.Now.AddDays(-1); public IOBManPanel() { InitializeComponent(); @@ -143,7 +146,7 @@ namespace IOB_MAN hlRestart = true; } // fix autorestart... - if(hlRestart) + if (hlRestart) { chkAutoRestart.ForeColor = System.Drawing.Color.Red; chkAutoRestart.Text = "Auto Restart!!!"; @@ -318,6 +321,7 @@ namespace IOB_MAN proc2restart.Add(item); } } + // SE abilitato autorestart... if (chkAutoRestart.Checked) { @@ -333,6 +337,15 @@ namespace IOB_MAN startChildProc(item.CodIOB); } } + else + { + // se autorestart scaduto e NON checked --> lo imposto + if (autoRestartElapsed < DateTime.Now) + { + // lo riattivo + chkAutoRestart.Checked = true; + } + } } /// @@ -651,6 +664,8 @@ namespace IOB_MAN private void chkAutoRestart_CheckedChanged(object sender, EventArgs e) { + // se tolgo autorestart --> imposto NUOVA scadenza x forzare check + autoRestartElapsed = DateTime.Now.AddMinutes(utils.CRI("autoRestartTimeoutMin")); // fa subito controllo riavvio... processAutoRestart(); } From 04f29bab10aa8b3f874174eb10150aab1c91ae65 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Dec 2019 12:53:40 +0100 Subject: [PATCH 2/3] Sistemata logica reset ed autorestart --- IOB-MAN/App.config | 2 +- IOB-MAN/IOBManPanel.Designer.cs | 50 +++++++++++++----- IOB-MAN/IOBManPanel.cs | 91 ++++++++++++++++++++++----------- 3 files changed, 99 insertions(+), 44 deletions(-) diff --git a/IOB-MAN/App.config b/IOB-MAN/App.config index f525d3ba..a95da3ed 100644 --- a/IOB-MAN/App.config +++ b/IOB-MAN/App.config @@ -7,7 +7,7 @@ - + diff --git a/IOB-MAN/IOBManPanel.Designer.cs b/IOB-MAN/IOBManPanel.Designer.cs index e1493b52..175c1a09 100644 --- a/IOB-MAN/IOBManPanel.Designer.cs +++ b/IOB-MAN/IOBManPanel.Designer.cs @@ -44,11 +44,13 @@ this.btnMinimizeAll = new System.Windows.Forms.Button(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel2 = new System.Windows.Forms.Panel(); + this.txtTOutAutoCheck = new System.Windows.Forms.TextBox(); + this.chkAutoRestart = new System.Windows.Forms.CheckBox(); this.btnOpenAll = new System.Windows.Forms.Button(); this.btnRestartAll = new System.Windows.Forms.Button(); this.btnCloseAll = new System.Windows.Forms.Button(); this.dgvManagedItems = new System.Windows.Forms.DataGridView(); - this.chkAutoRestart = new System.Windows.Forms.CheckBox(); + this.btnMoreTOut = new System.Windows.Forms.Button(); this.statusStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -190,6 +192,8 @@ // panel2 // this.panel2.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.panel2.Controls.Add(this.btnMoreTOut); + this.panel2.Controls.Add(this.txtTOutAutoCheck); this.panel2.Controls.Add(this.chkAutoRestart); this.panel2.Controls.Add(this.btnOpenAll); this.panel2.Controls.Add(this.btnRestartAll); @@ -204,6 +208,28 @@ this.panel2.Size = new System.Drawing.Size(116, 341); this.panel2.TabIndex = 85; // + // txtTOutAutoCheck + // + this.txtTOutAutoCheck.Location = new System.Drawing.Point(11, 306); + this.txtTOutAutoCheck.Name = "txtTOutAutoCheck"; + this.txtTOutAutoCheck.Size = new System.Drawing.Size(64, 20); + this.txtTOutAutoCheck.TabIndex = 86; + this.txtTOutAutoCheck.Visible = false; + this.txtTOutAutoCheck.TextChanged += new System.EventHandler(this.txtTOutAutoCheck_TextChanged); + // + // chkAutoRestart + // + 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.Name = "chkAutoRestart"; + this.chkAutoRestart.Size = new System.Drawing.Size(85, 17); + this.chkAutoRestart.TabIndex = 85; + this.chkAutoRestart.Text = "Auto Restart"; + this.chkAutoRestart.UseVisualStyleBackColor = true; + this.chkAutoRestart.CheckedChanged += new System.EventHandler(this.chkAutoRestart_CheckedChanged); + // // btnOpenAll // this.btnOpenAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -260,18 +286,16 @@ this.dgvManagedItems.TabIndex = 76; this.dgvManagedItems.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvManagedItems_CellDoubleClick); // - // chkAutoRestart + // btnMoreTOut // - this.chkAutoRestart.AutoSize = true; - this.chkAutoRestart.Checked = true; - this.chkAutoRestart.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkAutoRestart.Location = new System.Drawing.Point(11, 283); - this.chkAutoRestart.Name = "chkAutoRestart"; - this.chkAutoRestart.Size = new System.Drawing.Size(85, 17); - this.chkAutoRestart.TabIndex = 85; - this.chkAutoRestart.Text = "Auto Restart"; - this.chkAutoRestart.UseVisualStyleBackColor = true; - this.chkAutoRestart.CheckedChanged += new System.EventHandler(this.chkAutoRestart_CheckedChanged); + this.btnMoreTOut.Location = new System.Drawing.Point(81, 306); + this.btnMoreTOut.Name = "btnMoreTOut"; + this.btnMoreTOut.Size = new System.Drawing.Size(25, 23); + this.btnMoreTOut.TabIndex = 87; + this.btnMoreTOut.Text = "+"; + this.btnMoreTOut.UseVisualStyleBackColor = true; + this.btnMoreTOut.Visible = false; + this.btnMoreTOut.Click += new System.EventHandler(this.btnMoreTOut_Click); // // IOBManPanel // @@ -324,6 +348,8 @@ private System.Windows.Forms.ToolStripMenuItem updateIOBMANToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem updateIOBWINToolStripMenuItem; private System.Windows.Forms.CheckBox chkAutoRestart; + private System.Windows.Forms.TextBox txtTOutAutoCheck; + private System.Windows.Forms.Button btnMoreTOut; } } diff --git a/IOB-MAN/IOBManPanel.cs b/IOB-MAN/IOBManPanel.cs index 7b897102..60f0b67a 100644 --- a/IOB-MAN/IOBManPanel.cs +++ b/IOB-MAN/IOBManPanel.cs @@ -37,10 +37,14 @@ namespace IOB_MAN /// protected int watchDogMult = utils.CRI("watchDogMult"); /// - /// Counter per verifica processi (ogni volta ceh va a zero faccio vero check) + /// Counter per verifica processi (ogni volta che va a zero faccio vero check) /// protected int chekMult = utils.CRI("chekMult"); /// + /// Counter del timer di base + /// + protected int checkPeriod = utils.CRI("checkPeriod"); + /// /// Elenco ARGS (uno per child da avviare) /// public List ArgsList = new List(); @@ -53,9 +57,9 @@ namespace IOB_MAN /// protected string TargetExe = ""; /// - /// Elapsed dell'autorestart + /// Contatore autockeck nativo /// - protected DateTime autoRestartElapsed = DateTime.Now.AddDays(-1); + protected int tOutAutocheck = 100; public IOBManPanel() { InitializeComponent(); @@ -74,7 +78,7 @@ namespace IOB_MAN ElencoIOB.ListChanged += ElencoIOB_ListChanged; // colelgo tab a binding dgvManagedItems.DataSource = ElencoIOB; - MainTimer.Interval = utils.CRI("checkPeriod"); + MainTimer.Interval = checkPeriod; loadConfig(); MainTimer.Start(); utils.lgInfo("Timer started"); @@ -150,11 +154,21 @@ namespace IOB_MAN { chkAutoRestart.ForeColor = System.Drawing.Color.Red; chkAutoRestart.Text = "Auto Restart!!!"; + txtTOutAutoCheck.Visible = true; + btnMoreTOut.Visible = true; + // se NON checked aggiorno contatore... + if (!chkAutoRestart.Checked) + { + tOutAutocheck--; + txtTOutAutoCheck.Text = (tOutAutocheck / (1000 / (utils.CRI("checkPeriod") * utils.CRI("chekMult")))).ToString(); + } } else { chkAutoRestart.ForeColor = DefaultForeColor; chkAutoRestart.Text = "Auto Restart"; + txtTOutAutoCheck.Visible = false; + btnMoreTOut.Visible = false; } } @@ -321,7 +335,7 @@ namespace IOB_MAN proc2restart.Add(item); } } - + // SE abilitato autorestart... if (chkAutoRestart.Checked) { @@ -340,7 +354,7 @@ namespace IOB_MAN else { // se autorestart scaduto e NON checked --> lo imposto - if (autoRestartElapsed < DateTime.Now) + if (tOutAutocheck < 0) { // lo riattivo chkAutoRestart.Checked = true; @@ -414,10 +428,13 @@ namespace IOB_MAN private void IOBManPanel_FormClosing(object sender, FormClosingEventArgs e) { - closeAllChild(); + closeAllChild(true); } - - private void closeAllChild() + /// + /// Chiude tutti i child + /// + /// resetta elenco + private void closeAllChild(bool doReset) { List item2rem = new List(); @@ -434,7 +451,15 @@ namespace IOB_MAN { Process p = Process.GetProcessById(item.pID); p.CloseMainWindow(); - ElencoIOB.Remove(item); + // indico NON running su datasource + if (doReset) + { + ElencoIOB.Remove(item); + } + else + { + item.isRunning = false; + } } catch { } @@ -468,9 +493,12 @@ namespace IOB_MAN { } } } - // resetto elenco! - ElencoIOB.Clear(); - numProcAvviati = 0; + if (doReset) + { + // resetto elenco! + ElencoIOB.Clear(); + numProcAvviati = 0; + } numProcRunning = 0; // update! updateStatus(); @@ -572,16 +600,7 @@ namespace IOB_MAN private void openALLToolStripMenuItem_Click(object sender, EventArgs e) { } - /// - /// Chiama chiusura + update status... - /// - /// - /// - private void closeALLToolStripMenuItem_Click(object sender, EventArgs e) - { - closeAllChild(); - updateStatus(); - } + /// /// Chiama Restart (close/start) + update status... @@ -591,7 +610,7 @@ namespace IOB_MAN private void restartALLToolStripMenuItem_Click(object sender, EventArgs e) { // chiude tutto - closeAllChild(); + closeAllChild(false); apriChild(); updateStatus(); } @@ -599,7 +618,7 @@ namespace IOB_MAN private void loadConfToolStripMenuItem_Click(object sender, EventArgs e) { // per iscurezza chiudo tutto - closeAllChild(); + closeAllChild(true); Thread.Sleep(1000); // lettura conf file... loadConfig(); @@ -611,7 +630,7 @@ namespace IOB_MAN private void updateModeToolStripMenuItem_Click(object sender, EventArgs e) { // chiude tutte - closeAllChild(); + closeAllChild(true); Thread.Sleep(1000); updateStatus(); // apre solo 1 con conf "fake" x condurre update... @@ -621,7 +640,7 @@ namespace IOB_MAN private void btnCloseAll_Click(object sender, EventArgs e) { // chiude tutto - closeAllChild(); + closeAllChild(false); //apriChild(); updateStatus(); } @@ -629,7 +648,7 @@ namespace IOB_MAN private void btnRestartAll_Click(object sender, EventArgs e) { // chiude tutto - closeAllChild(); + closeAllChild(true); apriChild(); updateStatus(); } @@ -638,7 +657,7 @@ namespace IOB_MAN private void btnOpenAll_Click(object sender, EventArgs e) { // per iscurezza chiudo tutto - closeAllChild(); + closeAllChild(true); Thread.Sleep(1000); // lettura conf file... loadConfig(); @@ -655,7 +674,7 @@ namespace IOB_MAN private void updateIOBWINToolStripMenuItem_Click(object sender, EventArgs e) { // chiude tutte - closeAllChild(); + closeAllChild(true); Thread.Sleep(1000); updateStatus(); // apre solo 1 con conf "fake" x condurre update... @@ -665,10 +684,20 @@ namespace IOB_MAN private void chkAutoRestart_CheckedChanged(object sender, EventArgs e) { // se tolgo autorestart --> imposto NUOVA scadenza x forzare check - autoRestartElapsed = DateTime.Now.AddMinutes(utils.CRI("autoRestartTimeoutMin")); + tOutAutocheck = 60 * utils.CRI("autoRestartTimeoutMin") * (1000 / (utils.CRI("checkPeriod") * utils.CRI("chekMult"))); // fa subito controllo riavvio... processAutoRestart(); } + + private void btnMoreTOut_Click(object sender, EventArgs e) + { + tOutAutocheck += 60 * utils.CRI("autoRestartTimeoutMin") * (1000 / (utils.CRI("checkPeriod") * utils.CRI("chekMult"))); + } + + private void txtTOutAutoCheck_TextChanged(object sender, EventArgs e) + { + + } } } From c4929ba9bb87534db1c110304e0707b09d627935 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 23 Dec 2019 12:54:41 +0100 Subject: [PATCH 3/3] Fix vers numb 3.0.1912.619 --- CVCncLib/testSam.XmlSerializers.dll | Bin 838656 -> 838656 bytes CVCncLib/testSam.dll | Bin 899584 -> 899584 bytes Jenkinsfile | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CVCncLib/testSam.XmlSerializers.dll b/CVCncLib/testSam.XmlSerializers.dll index 410b706eb7e6bbe26b270a9117c1236b44a360fa..b5a5e75d718e11f93785f368f14f322c3776233d 100644 GIT binary patch delta 165 zcmZpeVcamoctQu$xmAr_tzC?*T}-WA%&lE4tzE3GU2I#s*gM)(EZi)dOiZ24bj^&6 zjdV>6EKGDQ%#59MO`VO*%`BbGEes6|+RfV8ftUk`If0l9h`G0$we!ds3LJCo?l($m zacHxSQO`Wy$gn+S2hUL+74uY6gS3>CG+k3mgG61ER5K%8i$qh9(TS<1NhYZ&W(MZl KeUI{NW&;483pAhr delta 165 zcmZpeVcamoctQu0ZE0gyYZqf{7gK8&b88n%YZq&47u(h@_Kr3cOGi^P7Z+DkT_*z< zLtPUia}!-BH&-`ZBO?PNCudg|6LS;GcC&VNAm#vKP9Ww2V(#r`?L2aZ0#EOT&APau z#A*L~C8j-Z-95Lb?BF@dqherYVrFV+WTtDLY@7%*)!0Bc$s#3HH^s=*G{w}wEHOFF LXuI!Gp3Q6k%PKY` diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index bf276146f4ec065f71bd25e8fc35a4f8e256a392..c767a9430f146281b2ac8133e0903eb894662c88 100644 GIT binary patch delta 130 zcmZqpV%G4*Y(fXqxmAr_tzC?*T}-WA%&lE4tzE3GU2Lsg?5$lKtzDe0U0hqcxKAw- zxc@hxjw>?BuPdZ&U9{gd_V$#;+(68;J!LWP8D^ccs~F-KfPe{zWf&P4JdW}*cr52- g2nu!ye$VLWX!McCZO7K&ds+<>O}ED^=UpNM084)`ivR!s delta 130 zcmZqpV%G4*Y(fWr}mV^+(68;J!LWP8D<@uQieDNAYcMw8Ab*MkE6T{9?N+d ff`VOwSL(>U