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

Merge branch 'release/UpdateRedisConf_01'

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-09 18:39:03 +02:00
parent 1e02e1a171 7aa7c5429b
commit dd5c626a8d
13 changed files with 81 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-ADM/Web.Release.config
+9 -15
View File
@@ -3,20 +3,14 @@
<!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
Nell'esempio seguente, la trasformazione "SetAttributes" modifica il valore di
"connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match"
individua un attributo "name" con valore "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)" />
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
<appSettings>
<add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
Nell'esempio seguente, la trasformazione "Replace" sostituisce l'intera
sezione <customErrors> del file web.config.
@@ -28,5 +22,5 @@
<error statusCode="500" redirect="InternalError.htm" />
</customErrors>
-->
</system.web>
</system.web>
</configuration>
MP-IO/Controllers/IOBController.cs
+4 -2
View File
@@ -1572,12 +1572,14 @@ namespace MP_IO.Controllers
// GET: IOB (è un check alive del server)
public string Index()
{
if (memLayer.ML.CRB("IOB_RedEnab"))
//if (memLayer.ML.CRB("IOB_RedEnab"))
if (true)
{
// conto la richiesta nel contatore REDIS
long nCall = memLayer.ML.setRCntI(DataLayer.mHash("COUNT:pCall:IOB_INDEX"));
//... se == nCall2Log scrivo su log e resetto
long nCall2Log = memLayer.ML.cdvi("nCall2Log");
long nCall2Log = 100;// memLayer.ML.cdvi("nCall2Log");
//long nCall2Log = memLayer.ML.cdvi("nCall2Log");
if (nCall >= nCall2Log)
{
// loggo
MP-IO/MP-IO.csproj.user
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS03.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\samuele.steamw\source\MoonPro.net\MP-IO\Properties\PublishProfiles\IIS01.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<ProjectView>ShowAllFiles</ProjectView>
<Use64BitIISExpress />
MP-IO/Properties/PublishProfiles/IIS01.pubxml.user
+2
View File
@@ -7,5 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAABHE5oPoHlG6fwYbvPGkksuAAAAAASAAACgAAAAEAAAALhOWzlQAPxJ2VE8lisaR9gYAAAAkDFsctmhzdLpUmOVleVAckCWeuODp7F1FAAAAAxKlaqhbiV+t3IJ+FqzhN+bBKS/</EncryptedPassword>
<History>True|2025-06-04T11:11:35.2130452Z||;True|2025-06-04T13:05:51.8038152+02:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
MP-IO/Web.Release.config
+5 -5
View File
@@ -4,11 +4,11 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="RedisConn" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="1" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnSPEC" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnSPECAdmin" value="localhost,DefaultDatabase=1,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnSPEC" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnSPECAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
MP-IO/Web.config
+4 -4
View File
@@ -14,11 +14,11 @@
</configSections>
<appSettings>
<!--Redis conn-->
<add key="RedisConn" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="RedisConn" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="redisDb" value="5" />
<add key="RedisConnSPEC" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnSPECAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="RedisConnSPEC" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnSPECAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="aspnet:RequestQueueLimitPerSession" value="50" />
<add key="aspnet:AllowConcurrentRequestsPerSession" value="true" />
<!--altri parametri-->
MP-MAG/Web.Release.config
+5 -11
View File
@@ -3,17 +3,11 @@
<!-- For more information on using Web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=301874 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
Nell'esempio riportato di seguito la trasformazione "SetAttributes" modifica il valore di
"connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match"
rileva un attributo "name" con valore "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<appSettings>
<add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
MP-Site/Web.Release.config
+5 -11
View File
@@ -3,17 +3,11 @@
<!-- Per altre informazioni sull'utilizzo della trasformazione web.config, vedere https://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
Nell'esempio seguente, la trasformazione "SetAttributes" modifica il valore di
"connectionString" in modo da utilizzare "ReleaseSQLServer" solo quando il localizzatore "Match"
individua un attributo "name" con valore "MyDB".
<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<appSettings>
<add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
MP-Site/Web.config
+2 -2
View File
@@ -14,8 +14,8 @@
</configSections>
<appSettings>
<!--Redis conn-->
<add key="RedisConn" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="RedisConn" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="redis.ufficio:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" />
<add key="redisDb" value="5" />
<add key="aspnet:RequestQueueLimitPerSession" value="50" />
<add key="aspnet:AllowConcurrentRequestsPerSession" value="true" />
MP-TAB/Web.Release.config
+9 -6
View File
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<add key="forceHttps" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
</system.web>
<appSettings>
<add key="RedisConn" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="redisDb" value="5" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="forceHttps" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
</system.web>
</configuration>
MapoSDK/Objects.cs
+2 -2
View File
@@ -419,12 +419,12 @@ namespace MapoSDK
/// <summary>
/// Valore MASSIMO (SE impostato)
/// </summary>
public int valMax { get; set; }
public double valMax { get; set; }
/// <summary>
/// Valore minimo (SE impostato)
/// </summary>
public int valMin { get; set; }
public double valMin { get; set; }
/// <summary>
/// Valore parametro (come stringa, decimali con ",", default VUOTO), sul CNC/PLC
MapoSDK/dataConf.cs
+26 -22
View File
@@ -2,6 +2,9 @@
using Newtonsoft.Json.Converters;
using System.Collections.Generic;
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
namespace MapoSDK
{
/// <summary>
@@ -11,40 +14,31 @@ namespace MapoSDK
{
#region Public Properties
/// <summary>
/// NOME parametro
/// </summary>
public string name { get; set; } = "none";
/// <summary>
/// DESCRIZIONE parametro
/// </summary>
public string description { get; set; } = "";
/// <summary>
/// Fattore per eventuale scalatura (es leggo 1234 --> 12,34 con factor=0.01, 123'400 con factor=100)
/// </summary>
public double factor { get; set; } = 1;
/// <summary>
/// Indice nell'area di memoria (da valore iniziale = 0)
/// </summary>
public int index { get; set; } = 0;
/// <summary>
/// Valore massimo ammesso (ove usato, es simulazione)
/// </summary>
public int maxVal { get; set; } = 9999;
/// <summary>
/// Nome "assoluto" della posizione nell'area di memoria (anche diverso da indice)
/// </summary>
public string memAddr { get; set; } = "";
/// <summary>
/// Valore minimo ammesso (ove usato, es simulazione)
/// Tipo di dato
/// </summary>
public int minVal { get; set; } = 0;
[JsonConverter(typeof(StringEnumConverter))]
public plcDataType tipoMem { get; set; } = plcDataType.Int;
/// <summary>
/// NOME parametro
/// Indice nell'area di memoria (da valore iniziale = 0)
/// </summary>
public string name { get; set; } = "none";
public int index { get; set; } = 0;
/// <summary>
/// Size in byte
@@ -52,10 +46,20 @@ namespace MapoSDK
public int size { get; set; } = 0;
/// <summary>
/// Tipo di dato
/// Fattore di MOLTIPLICA per eventuale scalatura
/// es: leggo 1'234 con factor=0.01 --> 12.34, con factor=100 --> 123'400
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
public plcDataType tipoMem { get; set; } = plcDataType.Int;
public double factor { get; set; } = 1;
/// <summary>
/// Valore massimo ammesso (ove usato, es simulazione)
/// </summary>
public double maxVal { get; set; } = 9999;
/// <summary>
/// Valore minimo ammesso (ove usato, es simulazione)
/// </summary>
public double minVal { get; set; } = 0;
/// <summary>
/// Unità di misura del parametro
MapoSDK/dataConfTSVC.cs
+6 -4
View File
@@ -1,11 +1,13 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System.Collections.Generic;
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
namespace MapoSDK
{
/// <summary>
/// Struttura conf tipo dati
/// Struttura conf tipo dati con estensione TimeSeries + VarCalc
/// </summary>
public class dataConfTSVC : dataConf
{
@@ -30,12 +32,12 @@ namespace MapoSDK
/// <summary>
/// Valore della DeadBand per rilevare variazioni in valore assoluto, se nullo non impiegato
/// </summary>
public double? thresholdAbs { get; set; } = null;
public double? thresholdAbs { get; set; }
/// <summary>
/// Valore della DeadBand per rilevare variazioni in valore percentuale (5% = 0.05), se nullo non impiegato
/// </summary>
public double? thresholdPerc { get; set; } = null;
public double? thresholdPerc { get; set; }
#endregion Public Properties