diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index 55d1df58..b774c781 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -206,12 +206,18 @@ namespace IOB_WIN /// protected void lgError(string txt2log) { - lg.Factory.Configuration.Variables["codIOB"] = this.CurrIOB; - lg.Error(txt2log); - // salvo anche in logwatcher... - newDisplayData currDispData = new newDisplayData(); - currDispData.newLiveLogData = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} | ERROR | {txt2log}"; - updateFormDisplay(currDispData); + if (!string.IsNullOrEmpty(txt2log)) + { + lg.Factory.Configuration.Variables["codIOB"] = this.CurrIOB; + lg.Error(txt2log); + // salvo anche in logwatcher... SE non si dimostra ricorsivo... + if (!txt2log.Contains("logWatcher")) + { + newDisplayData currDispData = new newDisplayData(); + currDispData.newLiveLogData = $"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} | ERROR | {txt2log}"; + updateFormDisplay(currDispData); + } + } } @@ -470,7 +476,7 @@ namespace IOB_WIN // verifico IOB status IobWinStatus currIobStatus = new IobWinStatus() { - CodIob = iobObj.cIobConf.codIOB, + CodIob = iobObj.cIobConf.codIOB, queueEvLen = evQueueLen, queueFlLen = flQueueLen, queueAlLen = alQueueLen, diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config index b5ce548d..35cecf7c 100644 --- a/IOB-WIN/App.config +++ b/IOB-WIN/App.config @@ -20,12 +20,12 @@ - - - - - - + + + + + + diff --git a/IOB-WIN/DATA/CONF/WPS.json b/IOB-WIN/DATA/CONF/WPS.json index 893a6133..fe198e13 100644 --- a/IOB-WIN/DATA/CONF/WPS.json +++ b/IOB-WIN/DATA/CONF/WPS.json @@ -1,7 +1,7 @@ { "SrvData": { "baseUri": "http://cassera.steamware.net/prova.html", - "driverName": "FIREFOX" + "driverName": "CHROME" }, "DynData": [ { diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs index 56376272..bb848db6 100644 --- a/IOB-WIN/IobWPS.cs +++ b/IOB-WIN/IobWPS.cs @@ -148,13 +148,11 @@ namespace IOB_WIN { try { - var t = TaskEx.Run(() => startDriver()); - t.Wait(); - + //var t = TaskEx.Run(() => startDriver()); + //t.Wait(); + // modalità sincrona + startDriver(); lgInfo("Completato start driver"); - - // vecchia modalità sincrona - //startDriver(); } catch (Exception exc) { @@ -181,7 +179,6 @@ namespace IOB_WIN ChromeDriverService service = ChromeDriverService.CreateDefaultService(Application.StartupPath); service.HideCommandPromptWindow = true; driver = new ChromeDriver(service, o); - //driver = new ChromeDriver(Environment.CurrentDirectory, o); } else { @@ -194,11 +191,10 @@ namespace IOB_WIN FirefoxDriverService service = FirefoxDriverService.CreateDefaultService(Application.StartupPath); service.HideCommandPromptWindow = true; driver = new FirefoxDriver(service, o); - //driver = new FirefoxDriver(Environment.CurrentDirectory, o); } // aggiungo timeout x JScripts - driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(10); - driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(10); + driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(20); + driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(20); // imposto pagina di acquisizione driver.Navigate().GoToUrl(baseUri); }