From c3cebb2a9a862f5a5e5506b9757a36ef3979e97f Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 11 Aug 2016 09:06:11 +0000 Subject: [PATCH] Fac_verify Overrules en diskspace beter controleren svn path=/Website/trunk/; revision=30256 --- APPL/FAC/fac_verify.inc | 108 ++++++++++++++++++++++++++++++++++------ APPL/Shared/default.inc | 4 +- APPL/Shared/locale.inc | 3 ++ 3 files changed, 99 insertions(+), 16 deletions(-) diff --git a/APPL/FAC/fac_verify.inc b/APPL/FAC/fac_verify.inc index e3ad0bac13..71a5cb0427 100644 --- a/APPL/FAC/fac_verify.inc +++ b/APPL/FAC/fac_verify.inc @@ -115,6 +115,7 @@ function zipfile(pathname, filename) background-color: #D6D8E8; } label { width: 50px; display: inline; } + th { text-align: left } table.inside td { padding: 0px; @@ -554,24 +555,49 @@ if (0) checker("Charset", checker("Free diskspace", function () { + res = resultcodes.unknown; try { - drvPath = Server.MapPath("./"); + + drvPath = Server.MapPath("../../"); //return { message: drvPath}; var d = fso.GetDrive(fso.GetDriveName(drvPath)); - var availtxt = (d.AvailableSpace/1024/1024/1024).toFixed(1) + " GB"; + var totaltxt = (d.TotalSize/1024/1024/1024).toFixed(1) + " GB"; + var free = d.AvailableSpace / d.TotalSize * 100; + if (free < 10) + free = free.toFixed(1); + else + free = Math.round(free); + var availtxt = (d.AvailableSpace/1024/1024/1024).toFixed(1) + " GB (" + free + "%)"; + txt = "Drive " + drvPath.toUpperCase(); //txt += "
Volumename " + d.VolumeName; //txt += "
Free Space: " + (d.FreeSpace/1024/1024/1024).toFixed(1) + " GB"; - txt += "
Available Space: " + availtxt; + txt += "
Total Space: " + totaltxt + + "
Available Space: " + availtxt; + + if (d.AvailableSpace < 2e9 || free < 5) // Minder dan 2GB of 5% is slecht + { + res = resultcodes.error; + txt += "
Less than 2GB or less than 5%"; + } + else if (d.AvailableSpace > 10e9 || free > 10) // Meer dan 10GB of meer dan 10% is ok + { + res = resultcodes.ok; + } + else // twijfel + { + res = resultcodes.warning; + txt += "
Less than 10GB or less than 10%"; + } } catch (e) { return { result: resultcodes.warning, - message: e.description, - info: "Could not read"}; + message: e.description, + info: "Could not read"}; } - return { result: resultcodes.ok, message: txt, info: availtxt }; + return { result: res, message: txt, info: availtxt }; } ) @@ -684,6 +710,60 @@ __GROUP = "Customer files"; testfolder("../../cust/"+custID+"/flexfiles", false); // neednotbethere testfolder("../../cust/"+custID+"/dwf", false); // neednotbethere +__GROUP = "Settings"; + +var puostring = "puo_forcemailaddress,puo_forcefromaddress,puo_forceorderaddress,puo_forcemobile,puo_fclt_web_url"; +if (this.settings) // (deze test werkt niet vanuit verify.asp.inc) +{ + checker("Environment custenv SETTING overrules", + function () + { + var txt = []; + var sets = "puo_forcemailaddress,puo_forcefromaddress,puo_forceorderaddress,puo_forcemobile,puo_fclt_web_url".split(","); + for (var i in settings.overrule) + { + if (puostring.indexOf(i) < 0) // die doen we apart + txt.push("" + i + "" + safe.html(settings.get_setting(i, null, true)) + "" + safe.html(S(i)) + ""); + } + if (txt.length) + result = { result: + resultcodes.warning, + message: "
NameOriginalOverrule
" + + txt.join("") + "
" }; + else + result= { result: resultcodes.ok, message: "No overrules" }; + + return result; + } + ) + checker("Environment custenv LCL overrules", + function () + { + var txt = []; + for (naam in overrule_lcl) + { + var orgtxt = ""; + if (cache_lcls[naam]) + orgtxt = cache_lcls[naam].orgtxt; + txt.push("" + naam + "" + safe.html(orgtxt) + "" + safe.html(L(naam)) + ""); + if (cache_lcls[naam]) + cache_lcls[naam].txt = overrule_lcl[naam]; + else + cache_lcls[naam] = { txt: overrule_lcl[naam], overrulefallback: true }; + } + if (txt.length) + result = { result: + resultcodes.warning, + message: "
NameOriginalOverrule
" + + txt.join("") + "
" }; + else + result= { result: resultcodes.ok, message: "No overrules" }; + + return result; + } + ) +} + __GROUP = "Putorders"; if (this.S) // (deze test werkt niet vanuit verify.asp.inc) @@ -691,15 +771,15 @@ if (this.S) // (deze test werkt niet vanuit verify.asp.inc) checker("Overrules", function () { + var puosets = puostring.split(","); var txt = []; - var sets = "puo_forcemailaddress,puo_forcefromaddress,puo_forceorderaddress,puo_forcemobile,puo_fclt_web_url".split(","); - for (var i in sets) - if (S(sets[i])) - txt.push(sets[i] + "" + safe.html(S(sets[i])) + ""); + for (var i in puosets) + if (S(puosets[i])) + txt.push(puosets[i] + "" + safe.html(S(puosets[i])) + ""); if (txt.length) result = { result: resultcodes.warning, message: "
" + txt.join("
") + "
" }; else - result= { result: resultcodes.ok, message: "Geen overrules" }; + result= { result: resultcodes.ok, message: "No overrules" }; return result; } @@ -710,7 +790,7 @@ if (this.S) // (deze test werkt niet vanuit verify.asp.inc) { if (!S("puo_fclt_web_url")) { - return { result: resultcodes.error, message: "S('puo_fclt_web_url') is not set. Putorders will not work" }; + return { result: resultcodes.warning, message: "S('puo_fclt_web_url') is not set.
Embedded photos will not be available" }; } var puo_web_url = S("puo_fclt_web_url") + "/appl/fac/fac_verify_test.asp?checkINSTANCE=1&fac_id=" + custID; // Controleer of we via S("puo_fclt_web_url") op dezelfde webserver uitkomen als de huidige request @@ -930,9 +1010,9 @@ checker("NLS_TERRITORY", var oRs = Oracle.Execute(sql); var eikdag = oRs("eikdag").Value; if (eikdag == 2) - return { result: resultcodes.ok, message: "1 januari 2007 is een maandag
Als FACILITOR al opgestart is geweest kan dit door connection pooling al gecorrigeerd zijn.", info: eikdag } + return { result: resultcodes.ok, message: "January 1st 2007 is a monday
This may have been corrected by connection pooling when FACILITOR has been started before.", info: eikdag } else - return { result: resultcodes.ok, message: "1 januari 2007 is geen maandag
(vanaf DB25 niet meer problematisch)", info: eikdag } + return { result: resultcodes.ok, message: "January 1st 2007 is not a monday
(since DB25 not problematic)", info: eikdag } } ) diff --git a/APPL/Shared/default.inc b/APPL/Shared/default.inc index 38d88a4756..9da587d139 100644 --- a/APPL/Shared/default.inc +++ b/APPL/Shared/default.inc @@ -122,9 +122,9 @@ settings = // finalTry -->geef fatal error bij problemen // (zonder finalTry proberen we eerst de cache te verversen) finalTry: false, // semi-globale ipv. parameter om nasty-recursion te voorkomen - get_setting : function (s, defval) + get_setting : function (s, defval, nooverrule) { - if (s.toLowerCase() in settings.overrule) + if (!nooverrule && s.toLowerCase() in settings.overrule) return settings.overrule[s.toLowerCase()]; var v = Application("SET_" + customerId + "_" + s); diff --git a/APPL/Shared/locale.inc b/APPL/Shared/locale.inc index ddd4d4f602..fd96fcf079 100644 --- a/APPL/Shared/locale.inc +++ b/APPL/Shared/locale.inc @@ -167,7 +167,10 @@ lcl = { for (naam in overrule_lcl) { if (cache_lcls[naam]) + { + cache_lcls[naam].orgtxt = cache_lcls[naam].txt; cache_lcls[naam].txt = overrule_lcl[naam]; + } else cache_lcls[naam] = { txt: overrule_lcl[naam], overrulefallback: true }; }