diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config b/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config
deleted file mode 100644
index a11a39e..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-NLog.config
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-app.config b/MP-MAG/App_Readme/SteamWare_demo/example-app.config
deleted file mode 100644
index fb42165..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-app.config
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt b/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt
deleted file mode 100644
index dd0ab8e..0000000
--- a/MP-MAG/App_Readme/SteamWare_demo/example-config-table.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# chiave valore valoreStd note
-_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net
-_allowForceUser true true abilita login forzato
-_commonPages menu menu pagina comune
-_emailPwd drmfsls16 drmfsls16 drmfsls16
-_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com
-_enableSSL true true true
-_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg
-_righeDataGrid 30 30 Num righe datagrid std
-_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche
-_righeDataGridLong 30 30 Num righe datagrid long
-_righeDataGridMed 15 15 Num righe datagrid med
-_righeDataGridShort 10 10 Num righe datagrid short
-_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com
-_useAIMSmtp false false impiego client posta elettronica alternativo
-_useAuthSmtp true true true
-AuthCookieName admodellingAuth admodellingAuth Cookie applicativo
-autoConfCmd true true Conferma automatica comandi barcode
-baseUrl http://site_name http://iis02/site_name URL base del sito
-cacheValSec 60 60 Validità cache dati in gestore Barcode
-cookieDayExp 365 365 Periodo validità cookie
-cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati
-enableCookie true true Abilitazione uso cookie
-enableLogOut true false Abilita button logout COMPLETO in alto a sx
-enablePlain true true Abilitazione decode plain
-maxAuth 1000 1000 num auth minimo per NON consumare tokens
-serializeSession true true Serializzazione valori in sessione (REDIS)
-SiteName iis02/site_name iis02/site_name Nome sito
-enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default
-doShrinkFolder true true Imposta compressione area LOGS
\ No newline at end of file
diff --git a/MP-MAG/Controllers/PrintQueueConfController.cs b/MP-MAG/Controllers/PrintQueueConfController.cs
index bf059a9..40f924c 100644
--- a/MP-MAG/Controllers/PrintQueueConfController.cs
+++ b/MP-MAG/Controllers/PrintQueueConfController.cs
@@ -1,12 +1,5 @@
-using Newtonsoft.Json;
-using SteamWare;
-using System;
+using SteamWare.Reports;
using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web;
using System.Web.Http;
namespace MP_API.Controllers
diff --git a/MP-MAG/Controllers/PrintQueueController.cs b/MP-MAG/Controllers/PrintQueueController.cs
index ed025f4..3db9f5c 100644
--- a/MP-MAG/Controllers/PrintQueueController.cs
+++ b/MP-MAG/Controllers/PrintQueueController.cs
@@ -1,6 +1,7 @@
using MagData;
using Newtonsoft.Json;
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Reports;
using System;
using System.Collections.Generic;
using System.Data;
@@ -47,11 +48,11 @@ namespace MP_API.Controllers
switch (tipoReport)
{
case reportRichiesto.CartellinoPedane:
- tab = (DataTable)MagDataLayer.man.taCPed.GetData(keyParam);
+ tab = MagDataLayer.man.taCPed.GetData(keyParam);
answ.Add("stp_prt_PartLabel", tab);
break;
case reportRichiesto.CartellinoFinitiOdette:
- tab = (DataTable)MagDataLayer.man.taCFOdette.GetData(keyParam);
+ tab = MagDataLayer.man.taCFOdette.GetData(keyParam);
answ.Add("stp_prt_StackLabel", tab);
break;
default:
diff --git a/MP-MAG/Controllers/ReportController.cs b/MP-MAG/Controllers/ReportController.cs
index 81066fb..f42af29 100644
--- a/MP-MAG/Controllers/ReportController.cs
+++ b/MP-MAG/Controllers/ReportController.cs
@@ -1,4 +1,5 @@
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Logger;
using System;
using System.IO;
using System.Web;
@@ -42,7 +43,7 @@ namespace MP_API.Controllers
}
catch (Exception exc)
{
- logger.lg.scriviLog($"Errore in get elenco reports{Environment.NewLine}{exc}");
+ Logging.Instance.Error($"Errore in get elenco reports{Environment.NewLine}{exc}");
}
return answ;
}
@@ -82,7 +83,7 @@ namespace MP_API.Controllers
}
catch (Exception exc)
{
- logger.lg.scriviLog($"Errore in get singolo report{Environment.NewLine}{exc}");
+ Logging.Instance.Error($"Errore in get singolo report{Environment.NewLine}{exc}");
}
return answ;
}
diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj
index 05a7438..31a71fd 100644
--- a/MP-MAG/MP-MAG.csproj
+++ b/MP-MAG/MP-MAG.csproj
@@ -1,12 +1,7 @@
-
-
-
-
-
Debug
@@ -52,12 +47,6 @@
4
-
- ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll
-
-
- ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll
-
..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll
@@ -86,12 +75,6 @@
..\packages\NLog.4.6.8\lib\net45\NLog.dll
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll
-
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll
-
..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll
@@ -104,8 +87,17 @@
..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll
-
- ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll
+
+ ..\packages\SteamWare.IO.4.0.2002.731\lib\net462\SteamWare.IO.dll
+ True
+
+
+ ..\packages\SteamWare.Logger.4.0.2002.731\lib\net462\SteamWare.Logger.dll
+ True
+
+
+ ..\packages\SteamWare.Reports.4.0.2002.731\lib\net462\SteamWare.Reports.dll
+ True
@@ -208,11 +200,6 @@
..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll
-
-
- ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
-
-
VersGen.cs
@@ -260,7 +247,6 @@
-
@@ -314,8 +300,6 @@
-
-
@@ -451,15 +435,8 @@
-
-
-
-
-
-
-
10.0
@@ -494,14 +471,9 @@
Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.
-
-
-
-
-
diff --git a/MP-MAG/Web.config b/MP-MAG/Web.config
index 63c5525..241bad2 100644
--- a/MP-MAG/Web.config
+++ b/MP-MAG/Web.config
@@ -14,11 +14,7 @@
-
-
-
-
-
+
@@ -307,10 +303,4 @@
-
-
-
-
-
-
diff --git a/MP-MAG/packages.config b/MP-MAG/packages.config
index 441ace8..13d1a25 100644
--- a/MP-MAG/packages.config
+++ b/MP-MAG/packages.config
@@ -1,7 +1,5 @@
-
-
@@ -23,13 +21,8 @@
-
-
-
-
-
@@ -39,14 +32,15 @@
-
-
+
+
+
diff --git a/MagData/App_Readme/SteamWare_demo/example-NLog.config b/MagData/App_Readme/SteamWare_demo/example-NLog.config
deleted file mode 100644
index a11a39e..0000000
--- a/MagData/App_Readme/SteamWare_demo/example-NLog.config
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MagData/App_Readme/SteamWare_demo/example-app.config b/MagData/App_Readme/SteamWare_demo/example-app.config
deleted file mode 100644
index fb42165..0000000
--- a/MagData/App_Readme/SteamWare_demo/example-app.config
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MagData/App_Readme/SteamWare_demo/example-config-table.txt b/MagData/App_Readme/SteamWare_demo/example-config-table.txt
deleted file mode 100644
index dd0ab8e..0000000
--- a/MagData/App_Readme/SteamWare_demo/example-config-table.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# chiave valore valoreStd note
-_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net
-_allowForceUser true true abilita login forzato
-_commonPages menu menu pagina comune
-_emailPwd drmfsls16 drmfsls16 drmfsls16
-_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com
-_enableSSL true true true
-_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg
-_righeDataGrid 30 30 Num righe datagrid std
-_righeDataGridAnagr 20 20 Num righe datagrid anagrafiche
-_righeDataGridLong 30 30 Num righe datagrid long
-_righeDataGridMed 15 15 Num righe datagrid med
-_righeDataGridShort 10 10 Num righe datagrid short
-_smtpCli smtp.gmail.com smtp.gmail.com smtp.gmail.com
-_useAIMSmtp false false impiego client posta elettronica alternativo
-_useAuthSmtp true true true
-AuthCookieName admodellingAuth admodellingAuth Cookie applicativo
-autoConfCmd true true Conferma automatica comandi barcode
-baseUrl http://site_name http://iis02/site_name URL base del sito
-cacheValSec 60 60 Validità cache dati in gestore Barcode
-cookieDayExp 365 365 Periodo validità cookie
-cookieUsed admodellingAuth admodellingAuth,CTrack_CodOpr,CTrack_CodPost Elenco dei cookie impiegati
-enableCookie true true Abilitazione uso cookie
-enableLogOut true false Abilita button logout COMPLETO in alto a sx
-enablePlain true true Abilitazione decode plain
-maxAuth 1000 1000 num auth minimo per NON consumare tokens
-serializeSession true true Serializzazione valori in sessione (REDIS)
-SiteName iis02/site_name iis02/site_name Nome sito
-enableDumpDiag false false abilitazione dumb diagnostico x eccezioni di default
-doShrinkFolder true true Imposta compressione area LOGS
\ No newline at end of file
diff --git a/MagData/MagData.csproj b/MagData/MagData.csproj
index f7ba7e9..767a56a 100644
--- a/MagData/MagData.csproj
+++ b/MagData/MagData.csproj
@@ -34,17 +34,11 @@
4
-
- ..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll
-
-
- ..\packages\AjaxControlToolkit.19.1.0\lib\net40\AjaxControlToolkit.dll
-
..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll
- ..\packages\DnsClient.1.2.0\lib\net471\DnsClient.dll
+ ..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll
..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll
@@ -79,14 +73,8 @@
..\packages\NLog.4.6.8\lib\net45\NLog.dll
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll
-
-
- ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll
-
- ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net472\Pipelines.Sockets.Unofficial.dll
+ ..\packages\Pipelines.Sockets.Unofficial.2.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll
..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll
@@ -95,10 +83,16 @@
..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll
- ..\packages\StackExchange.Redis.2.0.601\lib\net472\StackExchange.Redis.dll
+ ..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll
-
- ..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll
+
+ ..\packages\SteamWare.IO.4.0.2002.730\lib\net462\SteamWare.IO.dll
+
+
+ ..\packages\SteamWare.Logger.4.0.2002.730\lib\net462\SteamWare.Logger.dll
+
+
+ ..\packages\SteamWare.Reports.4.0.2002.730\lib\net462\SteamWare.Reports.dll
@@ -110,11 +104,7 @@
..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll
-
- ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll
- True
- True
-
+
..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll
@@ -170,8 +160,6 @@
-
-
DS_Report.xsd
@@ -191,7 +179,6 @@
-
@@ -202,7 +189,5 @@
Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.
-
-
\ No newline at end of file
diff --git a/MagData/MagDataLayer.cs b/MagData/MagDataLayer.cs
index a7ad413..a099b5d 100644
--- a/MagData/MagDataLayer.cs
+++ b/MagData/MagDataLayer.cs
@@ -1,11 +1,9 @@
using Newtonsoft.Json;
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Reports;
using System;
using System.Collections.Generic;
using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Web;
namespace MagData
@@ -81,7 +79,7 @@ namespace MagData
}
catch (Exception exc)
{
- Log.Instance.Error(exc, "Eccezione in decodifica file conf printQueue");
+ SteamWare.Logger.Logging.Instance.Error(exc, "Eccezione in decodifica file conf printQueue");
}
}
}
@@ -107,7 +105,7 @@ namespace MagData
}
catch (Exception exc)
{
- Log.Instance.Error(exc, "Eccezione in recupero dati queueConf da redis");
+ SteamWare.Logger.Logging.Instance.Error(exc, "Eccezione in recupero dati queueConf da redis");
}
}
// controllo se vuoto rileggo da file
@@ -144,16 +142,16 @@ namespace MagData
answ = reportPrinter.obj.stampaReport(keyParam, printQueue);
if (answ)
{
- logger.lg.scriviLog($" | {clientIp} | salvata richiesta stampa su coda {printQueue} | key {keyParam}", tipoLog.INFO);
+ SteamWare.Logger.Logging.Instance.Info($" | {clientIp} | salvata richiesta stampa su coda {printQueue} | key {keyParam}");
}
else
{
- logger.lg.scriviLog($"ERRORE | {clientIp} | richiesta stampa su coda {printQueue} | key {keyParam}", tipoLog.ERROR);
+ SteamWare.Logger.Logging.Instance.Error($"ERRORE | {clientIp} | richiesta stampa su coda {printQueue} | key {keyParam}");
}
}
else
{
- logger.lg.scriviLog($"Impossibile | {clientIp} | richiesta stampa su coda {printQueue} | key {keyParam}", tipoLog.ERROR);
+ SteamWare.Logger.Logging.Instance.Error($"Impossibile | {clientIp} | richiesta stampa su coda {printQueue} | key {keyParam}");
}
return answ;
}
@@ -174,7 +172,7 @@ namespace MagData
{
try
{
- tipoReport = (reportRichiesto)Enum.Parse(typeof(reportRichiesto), coda.template.Replace(".rdlc",""));
+ tipoReport = (reportRichiesto)Enum.Parse(typeof(reportRichiesto), coda.template.Replace(".rdlc", ""));
}
catch
{ }
diff --git a/MagData/app.config b/MagData/app.config
index 827c5eb..bd1b6e1 100644
--- a/MagData/app.config
+++ b/MagData/app.config
@@ -1,44 +1,52 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/MagData/packages.config b/MagData/packages.config
index 62cae3f..76f3a4c 100644
--- a/MagData/packages.config
+++ b/MagData/packages.config
@@ -1,34 +1,30 @@
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MagData/reportPrinter.cs b/MagData/reportPrinter.cs
index ae07c2a..91aa8f2 100644
--- a/MagData/reportPrinter.cs
+++ b/MagData/reportPrinter.cs
@@ -1,5 +1,7 @@
using Microsoft.Reporting.WinForms;
-using SteamWare;
+using SteamWare.IO;
+using SteamWare.Logger;
+using SteamWare.Reports;
using System;
using System.Collections.Generic;
using System.Data;
@@ -38,8 +40,8 @@ namespace MagData
{
// creo files con nomi univoci...
string filePathName = string.Format(@"~\temp\{0}_{1:HHmmss}_{1:ffff}.{2}", name, DateTime.Now, fileNameExtension);
- Stream stream = new FileStream(SteamWare.SteamwareStrings.getFilePath(filePathName), FileMode.Create);
- //Stream stream = new FileStream(SteamWare.SteamwareStrings.getFilePath(@"~\temp\" + name + "." + fileNameExtension), FileMode.Create);
+ Stream stream = new FileStream(fileMover.getFilePath(filePathName), FileMode.Create);
+ //Stream stream = new FileStream(fileMover.getFilePath(@"~\temp\" + name + "." + fileNameExtension), FileMode.Create);
m_streams.Add(stream);
return stream;
}
@@ -55,11 +57,11 @@ namespace MagData
private Stream CreateStreamPdf(string name, string fileNameExtension, Encoding encoding, string mimeType, bool willSeek)
{
// creo Directory se non c'è
- SteamWare.fileMover fm = new fileMover(string.Format(@"{0}\{1:yyyy}\{1:MM}\{1:dd}\", memLayer.ML.confReadString("PdfFolder"), DateTime.Now), "");
+ fileMover fm = new fileMover(string.Format(@"{0}\{1:yyyy}\{1:MM}\{1:dd}\", memLayer.ML.confReadString("PdfFolder"), DateTime.Now), "");
fm.checkDir();
string pdfPathName = string.Format(@"{0}\{1:yyyy}\{1:MM}\{1:dd}\{2}_{1:HHmmss}_{1:ffff}.{3}", memLayer.ML.confReadString("PdfFolder"), DateTime.Now, name, fileNameExtension);
- //Stream stream = new FileStream(SteamWare.SteamwareStrings.getFilePath(@"~\temp\" + name + "." + fileNameExtension), FileMode.Create);
- Stream stream = new FileStream(SteamWare.SteamwareStrings.getFilePath(pdfPathName), FileMode.Create);
+ //Stream stream = new FileStream(fileMover.getFilePath(@"~\temp\" + name + "." + fileNameExtension), FileMode.Create);
+ Stream stream = new FileStream(fileMover.getFilePath(pdfPathName), FileMode.Create);
m_streams.Add(stream);
return stream;
}
@@ -83,12 +85,15 @@ namespace MagData
//const string printerName = "Microsoft Office Document Image Writer";
//const string printerName = "Brother HL-2170W series";
if (m_streams == null || m_streams.Count == 0)
+ {
return;
+ }
+
PrintDocument printDoc = new PrintDocument();
printDoc.PrinterSettings.PrinterName = printerName;
if (!printDoc.PrinterSettings.IsValid)
{
- logger.lg.scriviLog(String.Format("Impostazioni non valide per la stampante \"{0}\".", printerName), tipoLog.ERROR);
+ Logging.Instance.Error($"Impostazioni non valide per la stampante {printerName}");
return;
}
printDoc.PrintPage += new PrintPageEventHandler(PrintPage);
@@ -103,7 +108,10 @@ namespace MagData
Warning[] warnings;
m_streams = new List();
report.Render("Image", deviceInfo, CreateStream, out warnings);
- foreach (Stream stream in m_streams) stream.Position = 0;
+ foreach (Stream stream in m_streams)
+ {
+ stream.Position = 0;
+ }
}
///
/// Export del report come PDF file.
@@ -114,7 +122,10 @@ namespace MagData
Warning[] warnings;
m_streams = new List();
report.Render("PDF", deviceInfo, CreateStreamPdf, out warnings);
- foreach (Stream stream in m_streams) stream.Position = 0;
+ foreach (Stream stream in m_streams)
+ {
+ stream.Position = 0;
+ }
}
///
/// dispone l'applicazione e rilascia le risorse
@@ -124,7 +135,10 @@ namespace MagData
if (m_streams != null)
{
foreach (Stream stream in m_streams)
+ {
stream.Close();
+ }
+
m_streams = null;
}
}
@@ -146,10 +160,10 @@ namespace MagData
switch (tipoReport)
{
case reportRichiesto.CartellinoPedane:
- tab = (DataTable)MagDataLayer.man.taCPed.GetData(keyParam);
+ tab = MagDataLayer.man.taCPed.GetData(keyParam);
break;
case reportRichiesto.CartellinoFinitiOdette:
- tab = (DataTable)MagDataLayer.man.taCFOdette.GetData(keyParam);
+ tab = MagDataLayer.man.taCFOdette.GetData(keyParam);
break;
default:
break;
@@ -398,14 +412,22 @@ namespace MagData
{
try
{
- if (logLevel > 5) logger.lg.scriviLog(String.Format("Sto per inviare un report alla stampante {0}", printerName), tipoLog.INFO);
+ if (logLevel > 5)
+ {
+ Logging.Instance.Info(String.Format("Sto per inviare un report alla stampante {0}", printerName));
+ }
+
reportPrinter.obj.printReport(report, printerName, keyParam, deviceInfo);
- if (logLevel > 5) logger.lg.scriviLog(String.Format("inviato comando print alla stampante {0}", printerName), tipoLog.INFO);
+ if (logLevel > 5)
+ {
+ Logging.Instance.Info(String.Format("inviato comando print alla stampante {0}", printerName));
+ }
+
answ = true;
}
catch (Exception e)
{
- logger.lg.scriviLog(String.Format("Errore in fase di creazione e stampa report: stampante {0}, errore riscontrato {1}", printerName, e), tipoLog.EXCEPTION);
+ Logging.Instance.Error(String.Format("Errore in fase di creazione e stampa report: stampante {0}, errore riscontrato {1}", printerName, e));
}
return answ;
}
@@ -441,7 +463,7 @@ namespace MagData
fatto = fileMover.obj.eliminaFile(_file);
if (fatto)
{
- logger.lg.scriviLog(String.Format("Eliminato file {0}", _file.Name), tipoLog.INFO);
+ Logging.Instance.Info(String.Format("Eliminato file {0}", _file.Name));
eliminati++;
}
}
@@ -449,7 +471,7 @@ namespace MagData
// salvo il log degli update
if (eliminati > 0)
{
- logger.lg.scriviLog(String.Format("Eliminati {0} files temporanei da area temp", eliminati), tipoLog.INFO);
+ Logging.Instance.Info(String.Format("Eliminati {0} files temporanei da area temp", eliminati));
}
}
diff --git a/MagData/utils.cs b/MagData/utils.cs
index b46832a..be67c02 100644
--- a/MagData/utils.cs
+++ b/MagData/utils.cs
@@ -1,4 +1,4 @@
-using SteamWare;
+using SteamWare.Logger;
using System;
using System.Web;
@@ -21,7 +21,7 @@ namespace MagData
}
catch (Exception exc)
{
- logger.lg.scriviLog($"Eccezione in decodifica path in persorso relativo all'app:{Environment.NewLine}{exc}", tipoLog.EXCEPTION);
+ Logging.Instance.Error($"Eccezione in decodifica path in persorso relativo all'app:{Environment.NewLine}{exc}");
}
return answ;
}