From 5089ca080e22657c0ab01404230679da669d62f3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 8 May 2019 00:46:38 +0200 Subject: [PATCH] Migliorata gestione doppio webdriver + send in chiusura SOLO SE server alive --- IOB-WIN/DATA/CONF/MAIN.ini | 4 ++-- IOB-WIN/IobGeneric.cs | 26 +++++++++++++++++--------- IOB-WIN/IobWPS.cs | 9 ++++----- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini index 316461b9..a713ce49 100644 --- a/IOB-WIN/DATA/CONF/MAIN.ini +++ b/IOB-WIN/DATA/CONF/MAIN.ini @@ -11,8 +11,8 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= [IOB] ;--- TEST SIMULAZIONE -;STARTLIST=WPS,WPS -STARTLIST=WPS +STARTLIST=WPS,WPS +;STARTLIST=WPS ;STARTLIST=SIMUL_01 ;STARTLIST=3015 diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 2e1bd60a..dba565a9 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -649,7 +649,7 @@ namespace IOB_WIN public virtual void stopAdapter(bool tryRestart, bool forceDequeue) { if (forceDequeue) - { + { // svuoto le code dei valori letti e non ancora trasmessi... parentForm.displayTaskAndLog("Svuotamento FORZATO coda segnali..."); while (QueueIN.Count > 0) @@ -2496,18 +2496,26 @@ namespace IOB_WIN // se NON sono in demo effettuo invio! if (!DemoOut) { - // chiamo URL! - string answ = callUrl(lastUrl); - // loggo! - lgInfo(string.Format("[SEND] {0} -> {1}", queueVal, answ)); - // se "OK" verde, altrimenti errore --> ROSSO - if (answ == "OK") + // SE server alive... + if (checkServerAlive) { - parentForm.sOUT = Semaforo.SV; + // chiamo URL! + string answ = callUrl(lastUrl); + // loggo! + lgInfo(string.Format("[SEND] {0} -> {1}", queueVal, answ)); + // se "OK" verde, altrimenti errore --> ROSSO + if (answ == "OK") + { + parentForm.sOUT = Semaforo.SV; + } + else + { + parentForm.sOUT = Semaforo.SR; + } } else { - parentForm.sOUT = Semaforo.SR; + lgInfo(string.Format("[SERVER KO] {0}", queueVal)); } } else diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs index e3b09f74..df6dd1d4 100644 --- a/IOB-WIN/IobWPS.cs +++ b/IOB-WIN/IobWPS.cs @@ -3,7 +3,6 @@ using Newtonsoft.Json; using OpenQA.Selenium; using OpenQA.Selenium.Chrome; using OpenQA.Selenium.Firefox; -using OpenQA.Selenium.Remote; using System; using System.Collections.Generic; using System.IO; @@ -28,7 +27,7 @@ namespace IOB_WIN /// /// Vettore della frequenza di ogni status trovato... invio ogni 100 rilevazioni (modulo 100, resto == 1) /// - protected Dictionary freqUnknStatus= new Dictionary(); + protected Dictionary freqUnknStatus = new Dictionary(); /// /// Pagina web da scaricare /// @@ -40,7 +39,7 @@ namespace IOB_WIN /// /// Driver per gestione chiamate crawling/scraping /// - protected RemoteWebDriver driver; + protected IWebDriver driver; /// /// Oggetti decodificati da pagina @@ -189,8 +188,8 @@ namespace IOB_WIN try { // in primis chiudo driver... - if (driver != null) - { + if (driver != null && driver.WindowHandles.Count > 0) + { driver.Quit(); } }