Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into IOB-NET

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-12-01 12:46:30 +01:00
parent 495ab8579b 4e32e6f408
commit 35b56fa7d4
3 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-MAN/IOBManPanel.cs
+21 -7
View File
@@ -430,6 +430,7 @@ namespace IOB_MAN
}
finally
{
checkRunning = false;
if (hasLock)
{
Monitor.Exit(_locker);
@@ -743,9 +744,9 @@ namespace IOB_MAN
private void forceCheckTimer_Tick(object sender, EventArgs e)
{
#if false
if (!checkRunning)
{
//checkProcessStatusAsync();
try
{
Task result = checkProcessStatusAsync();
@@ -756,6 +757,21 @@ namespace IOB_MAN
Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
}
}
#endif
if (!checkRunning)
{
try
{
Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
result.Wait();
}
catch (Exception exc)
{
Logging.Instance.Error($"forceCheckTimer_Tick {exc}");
}
}
checkWatchdog();
// riavvio i timer x sicurezza...
UI_Timer.Stop();
@@ -950,13 +966,14 @@ namespace IOB_MAN
/// <param name="e"></param>
private void MainTimer_Tick(object sender, EventArgs e)
{
//MainTimer.Stop();
if (!checkRunning)
{
//checkProcessStatusAsync();
try
{
Task result = checkProcessStatusAsync();
//Task result = checkProcessStatusAsync();
//result.Wait();
Task result = Task.Run(() => checkProcessStatusAsync().ConfigureAwait(false));
result.Wait();
}
catch (Exception exc)
@@ -964,7 +981,6 @@ namespace IOB_MAN
Logging.Instance.Error($"MainTimer_Tick {exc}");
}
}
//MainTimer.Start();
}
/// <summary>
@@ -1148,10 +1164,8 @@ namespace IOB_MAN
private void UI_Timer_Tick(object sender, EventArgs e)
{
//UI_Timer.Stop();
Task result = updateProgBarAsync();
result.Wait();
//UI_Timer.Start();
}
private void updateIOBWINToolStripMenuItem_Click(object sender, EventArgs e)
IOB-MAN/NLog.config
+58 -19
View File
@@ -6,36 +6,75 @@
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
<!-- optional, add some variables
<!-- optional, add some variables
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<variable name="logDir" value="${basedir}/logs" />
<!--
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!--
<targets>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<target xsi:type="File"
name="f_base"
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
archiveNumbering="Sequence"
archiveAboveSize="10240000"
maxArchiveFiles="60"
enableArchiveFileCompression="false"
keepFileOpen="false" />
<target xsi:type="File"
name="f_error"
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}${newline}${exception:format=tostring}"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
archiveNumbering="Sequence"
archiveAboveSize="10240000"
maxArchiveFiles="60"
enableArchiveFileCompression="false"
keepFileOpen="false" />
<!--Target per asp.net 4.5+ (NON VA con 4.0 common-->
<!--<target xsi:type="File"
name="f"
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}|${exception:format=tostring}"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.zip"
archiveNumbering="Sequence"
archiveEvery="Day"
archiveOldFileOnStartup="true"
maxArchiveFiles="90"
enableArchiveFileCompression="true"
keepFileOpen="true"
/>-->
<!--<target name="fAsync" xsi:type="AsyncWrapper" queueLimit="5" overflowAction="Discard">
<target xsi:type="File"
keepFileOpen="true"
fileName="${basedir}/logs/${shortdate}_${var:codIOB:default=0000}.log"
layout="${longdate}|${uppercase:${level}}|${var:codIOB:default=0000}|${callsite}|${message}|${exception:format=tostring}"
archiveFileName="${basedir}/logs/${shortdate}_${var:codIOB:default=0000}.{###}.zip"
archiveNumbering="Sequence"
archiveEvery="Day"
archiveOldFileOnStartup="true"
maxArchiveFiles="0"
enableArchiveFileCompression="true" />
</target>-->
</targets>
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>
<rules>
<!-- add your logging rules here -->
<!--
<rules>
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
<logger name="*" minlevel="Debug" maxlevel="Warn" final="true" writeTo="f_base" />
<logger name="*" minlevel="Error" writeTo="f_error" />
</rules>
</nlog>
Jenkinsfile
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=754']) {
withEnv(['NEXT_BUILD_NUMBER=755']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'