admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fac_verify Overrules en diskspace beter controleren

Browse Source 
svn path=/Website/trunk/; revision=30256
This commit is contained in:
Jos Groot Lipman
2016-08-11 09:06:11 +00:00
parent 397c73465d
commit c3cebb2a9a
3 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
APPL/FAC/fac_verify.inc
View File

@@ -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 += "<br>Volumename " + d.VolumeName;
//txt += "<br>Free Space: " + (d.FreeSpace/1024/1024/1024).toFixed(1) + " GB";
txt += "<br>Available Space: " + availtxt;
txt += "<br>Total Space: " + totaltxt
+ "<br>Available Space: " + availtxt;
if (d.AvailableSpace < 2e9 || free < 5) // Minder dan 2GB of 5% is slecht
{
res = resultcodes.error;
txt += "<br>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 += "<br>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("<tr><td>" + i + "</td><td>" + safe.html(settings.get_setting(i, null, true)) + "</td><td><strong>" + safe.html(S(i)) + "</strong></td></tr>");
}
if (txt.length)
result = { result:
resultcodes.warning,
message: "<table><tr><th>Name</th><th>Original</th><th>Overrule</th></tr><tr><td>"
+ txt.join("") + "</table>" };
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("<tr><td>" + naam + "</td><td>" + safe.html(orgtxt) + "</td><td><strong>" + safe.html(L(naam)) + "</strong></td></tr>");
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: "<table><tr><th>Name</th><th>Original</th><th>Overrule</th></tr><tr><td>"
+ txt.join("") + "</table>" };
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] + "</td><td><strong>" + safe.html(S(sets[i])) + "</strong>");
for (var i in puosets)
if (S(puosets[i]))
txt.push(puosets[i] + "</td><td><strong>" + safe.html(S(puosets[i])) + "</strong>");
if (txt.length)
result = { result: resultcodes.warning, message: "<table><tr><td>" + txt.join("</td></tr><tr><td>") + "</td></tr></table>" };
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.<br>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<br><span style='font-size: 9px'>Als FACILITOR al opgestart is geweest kan dit door connection pooling al gecorrigeerd zijn.</span>", info: eikdag }
return { result: resultcodes.ok, message: "January 1st 2007 is a monday<br><span style='font-size: 9px'>This may have been corrected by connection pooling when FACILITOR has been started before.</span>", info: eikdag }
else
return { result: resultcodes.ok, message: "1 januari 2007 is geen maandag<br>(vanaf DB25 niet meer problematisch)", info: eikdag }
return { result: resultcodes.ok, message: "January 1st 2007 is not a monday<br>(since DB25 not problematic)", info: eikdag }
}
)

4
APPL/Shared/default.inc
View File

@@ -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);

3
APPL/Shared/locale.inc
View File

@@ -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 };
}