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

Fix problema com 101 su SITE

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-12-07 18:28:15 +01:00
parent 4bf9022976
commit 1872dfcfec
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1035']) {
withEnv(['NEXT_BUILD_NUMBER=1036']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Site/WebUserControls/mod_statoMacchina.ascx.cs
+17 -5
View File
@@ -277,19 +277,31 @@ namespace MP_SITE.WebUserControls
/// </summary>
private void updateHL()
{
bool answ = true;
bool answ = false;
int minuti = memLayer.ML.CRI("keepAliveMin");
// controllo se il keep alive è oltre il termine...
DateTime lastKA = DateTime.Now.AddMinutes(-minuti);
if (_IdxMacchina != "nd")
{
string nomeVar = string.Format("KeepAlive:{0}", _IdxMacchina);
var _lastKA = memLayer.ML.objCacheObj(nomeVar);
if (_lastKA != null)
string redKey = memLayer.ML.redHash(nomeVar);
var _lastKA = memLayer.ML.getRSV(redKey);
if (_lastKA == null)
{
DateTime.TryParse(_lastKA.ToString(), out lastKA);
answ = true;
//cerco su DB...
try
{
var tabDati = DataLayer.obj.taKeepAlive.getByIdxMacchina(_IdxMacchina);
if (tabDati.Rows.Count > 0)
{
lastKA = tabDati[0].DataOraServer;
answ = (lastKA.AddMinutes(minuti) < DateTime.Now);
}
}
catch
{ }
}
answ = (lastKA.AddMinutes(minuti) < DateTime.Now) || _lastKA == null;
}
hlComWarning.Visible = answ;
}