Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix obj DataLayer x ricordione con MapoDb in loop x rebootLog track

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-30 08:57:05 +02:00
parent 185730f7a0
commit d377c1cc86
9 changed files with 105 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-IO/Controllers/IOBController.cs
+13 -1
View File
@@ -2126,9 +2126,21 @@ namespace MP_IO.Controllers
{ }
try
{
// uso datalayer che COMPRENDE MapoDb...
DataLayer DataLayerObj = new DataLayer();
int num2keep = 5;
var rConf = DataLayerObj.ListConfig.Where(x => x.chiave == "").FirstOrDefault();
if (rConf != null)
{
int.TryParse(rConf.valore, out num2keep);
}
// chiamo registrazione reboot
DataLayerObj.MapoDbObj.registraStartup(id, IPv4, agent, mac, num2keep);
#if false
// ora salvo che la macchina è stata (ri)avviata...
MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb();
MapoDbObj.registraStartup(id, IPv4, agent, mac);
MapoDbObj.registraStartup(id, IPv4, agent, mac);
#endif
answ = "OK";
}
catch (Exception exc)
MP-IO/MP-IO.csproj
+1 -1
View File
@@ -402,7 +402,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MagData\MagData.csproj">
<Project>{973245E4-02C0-4ED1-A81B-1727C5F4CA59}</Project>
<Project>{973245e4-02c0-4ed1-a81b-1727c5f4ca59}</Project>
<Name>MagData</Name>
</ProjectReference>
<ProjectReference Include="..\MapoDb\MapoDb.csproj">
MP-IO/sendReboot.aspx.cs
+49 -47
View File
@@ -3,55 +3,57 @@ using System;
namespace MP_IO
{
public partial class sendReboot : System.Web.UI.Page
{
/// <summary>
/// caricamento pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
public partial class sendReboot : System.Web.UI.Page
{
// legge i get x registrare che una macchina è stata riavviata
string idxMacchina = "";
string IPv4 = "";
string agent = "";
string macAddr = "";
try
{
idxMacchina = Request.QueryString["idxMacchina"];
}
catch
{ }
try
{
macAddr = Request.QueryString["mac"]; // opzionale, mac address!!!
}
catch
{ }
try
{
// recupero IP del client remoto
IPv4 = Request.UserHostName;
agent = Request.UserAgent;
}
catch
{ }
try
{
// ora salvo che la macchina è stata (ri)avviata...
MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb();
MapoDbObj.registraStartup(idxMacchina, IPv4, agent, macAddr);
}
catch (Exception exc)
{
if (memLayer.ML.CRI("_logLevel") > 5)
/// <summary>
/// caricamento pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc);
logger.lg.scriviLog(errore, tipoLog.EXCEPTION);
lblOut.Text = errore;
// legge i get x registrare che una macchina è stata riavviata
string idxMacchina = "";
string IPv4 = "";
string agent = "";
string macAddr = "";
try
{
idxMacchina = Request.QueryString["idxMacchina"];
}
catch
{ }
try
{
macAddr = Request.QueryString["mac"]; // opzionale, mac address!!!
}
catch
{ }
try
{
// recupero IP del client remoto
IPv4 = Request.UserHostName;
agent = Request.UserAgent;
}
catch
{ }
try
{
// ora salvo che la macchina è stata (ri)avviata...
MapoDb.MapoDb MapoDbObj = new MapoDb.MapoDb();
// hard coded num2keep valori reboot
int num2keep = 10;
MapoDbObj.registraStartup(idxMacchina, IPv4, agent, macAddr, num2keep);
}
catch (Exception exc)
{
if (memLayer.ML.CRI("_logLevel") > 5)
{
string errore = string.Format("Errore: {0}{1}", Environment.NewLine, exc);
logger.lg.scriviLog(errore, tipoLog.EXCEPTION);
lblOut.Text = errore;
}
}
}
}
}
}
}
MapoDb/DataLayer.cs
+8 -4
View File
@@ -20,6 +20,7 @@ namespace MapoDb
/// </summary>
public class DataLayer
{
#region Public Fields
/// <summary>
@@ -110,11 +111,14 @@ namespace MapoDb
// init oggetto MapoDb
MapoDbObj = new MapoDb();
#if false
// init message channel...
BroadastMsgPipe = new MessagePipe(connRedis, Constants.BROADCAST_M_PIPE);
#endif
// init config..
ListConfig = taConfig.GetData();
}
/// <summary>
/// Valori config da tabella corrente
/// </summary>
public DS_Utility.ConfigDataTable ListConfig = new DS_Utility.ConfigDataTable();
/// <summary>
/// Init class
MapoDb/MapoDb.cs
+5 -16
View File
@@ -47,14 +47,7 @@ namespace MapoDb
public MapoDb()
{
AvviaTabAdapt();
// aggiungo una copia dei valori config correnti...
DataLayer man = new DataLayer();
listConfig = man.taConfig.GetData();
}
/// <summary>
/// Valori config da tabella corrente
/// </summary>
private DS_Utility.ConfigDataTable listConfig = new DS_Utility.ConfigDataTable();
#endregion Public Constructors
@@ -570,8 +563,9 @@ namespace MapoDb
/// <param name="IPv4"></param>
/// <param name="agent"></param>
/// <param name="macAddr">mac address (inviato dalla macchina)</param>
/// <param name="num2keep">num record da mantenere x reboot</param>
/// <returns></returns>
public inputComandoMapo registraStartup(string idxMacchina, string IPv4, string agent, string macAddr)
public inputComandoMapo registraStartup(string idxMacchina, string IPv4, string agent, string macAddr, int num2keep)
{
if (memLayer.ML.CRI("_logLevel") > 6)
{
@@ -580,7 +574,7 @@ namespace MapoDb
// formatto output
inputComandoMapo answ = new inputComandoMapo();
// scrivo remote reboot alive!
scriviRemoteReboot(idxMacchina, IPv4, agent, macAddr);
scriviRemoteReboot(idxMacchina, IPv4, agent, macAddr, num2keep);
// scrivo PRIMO keep alive
scriviPrimoKeepAlive(idxMacchina, DateTime.Now);
@@ -671,17 +665,12 @@ namespace MapoDb
/// <param name="IdxMacchina"></param>
/// <param name="IPv4"></param>
/// <param name="macAddr"></param>
/// <param name="num2keep">num record da mantenere x reboot</param>
/// <returns></returns>
public void scriviRemoteReboot(string IdxMacchina, string IPv4, string agent, string macAddr)
public void scriviRemoteReboot(string IdxMacchina, string IPv4, string agent, string macAddr, int num2keep)
{
taRRL.Insert(IdxMacchina, IPv4, agent, DateTime.Now, macAddr);
// chiama stored x ripulire dati
int num2keep = 5;
var rConf = listConfig.Where(x => x.chiave == "").FirstOrDefault();
if (rConf != null)
{
int.TryParse(rConf.valore, out num2keep);
}
taRRL.KeepLatest(num2keep);
}
MapoDb/Properties/Settings.Designer.cs
Generated
+2 -2
View File
@@ -12,7 +12,7 @@ namespace MapoDb.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -93,7 +93,7 @@ namespace MapoDb.Properties {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=Tru" +
"e;User ID=sa;Password=keyhammer16;TrustServerCertificate=True")]
"e;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;")]
public string MoonPro_FluxDataConnectionString {
get {
return ((string)(this["MoonPro_FluxDataConnectionString"]));
MapoDb/Properties/Settings.settings
+2 -2
View File
@@ -53,10 +53,10 @@
<Setting Name="MoonPro_FluxDataConnectionString" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True</Value>
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;</Value>
</Setting>
</Settings>
</SettingsFile>
MapoDb/app.config
+23 -8
View File
@@ -5,14 +5,29 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<connectionStrings>
<add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonProConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Donati;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoModel" connectionString="data source=SQL2016DEV;initial catalog=MoonPro;persist security info=True;user id=sa; password=keyhammer16; MultipleActiveResultSets=True; App=EntityFramework; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_IS_ArcaConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_MAGConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_MAG;Persist Security Info=True;User ID=sa;Password=keyhammer16; TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_FluxDataConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_FluxData;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
MapoSDK/MapoSDK.csproj
+2 -1
View File
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MapoSDK</RootNamespace>
<AssemblyName>MapoSDK</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<Authors>Samuele E. Locatelli</Authors>
<Company>EgalWare</Company>
<Description>SDK for MAPO solutions</Description>
@@ -19,6 +19,7 @@
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>