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

FSN#37436 Nieuwe SLNKDWF versie 4.14 controleren. Clocks controle aanscherpen

Browse Source 
svn path=/Website/trunk/; revision=30400
This commit is contained in:
Jos Groot Lipman
2016-08-24 09:55:07 +00:00
parent 7f83212f19
commit 535ce72bf8
1 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
APPL/FAC/fac_verify.inc
View File

@@ -199,7 +199,7 @@ function zipfile(pathname, filename)
}
else
{
txt = "Strange: could not verify 500_error.asp, status: " + xhrb.status;
txt = "Strange: could not verify 500B error, status: " + xhrb.status;
}
var span = document.getElementById('check500b');
span.innerHTML = txt;
@@ -258,10 +258,10 @@ function zipfile(pathname, filename)
// Check for caching headers
var xhr4 = new XMLHttpRequest();
xhr4.open('GET', '../localscripts/date.js');
xhr4.open('GET', '../localscripts/date.js?x=<%=new Date().getTime()%>');
xhr4.onreadystatechange = function()
{
var txt = "<no Cache-Control header>";
var txt = "<no Cache-Control header with max-age>";
// Ready state 4 means the request is done
if (xhr4.readyState === 4)
{
@@ -809,7 +809,7 @@ if (this.S) // (deze test werkt niet vanuit verify.asp.inc)
{
if (!S("puo_fclt_web_url"))
{
return { result: resultcodes.warning, message: "S('puo_fclt_web_url') is not set.<br>Embedded photos will not be available" };
return { result: resultcodes.warning, message: "S('puo_fclt_web_url') is not set.<br>Embedded photos in e-mails 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
@@ -1072,13 +1072,18 @@ checker("Database characterset",
checker("NLS_TERRITORY",
function ()
{
var sql = "SELECT TO_NUMBER (TO_CHAR (TO_DATE('01-01-2007', 'DD-MM-YYYY'), 'D')) eikdag FROM DUAL";
// Let op: fac-verify.asp heeft een 'eigen' Oracle object, niet die uit m_connections.inc
// de BEGIN fac.initsession('NL'); END; is er dan ook nog niet over heen geweest.
// In vroege testen was het desalniettemin met connection pooling al gecorrigeerd in het
// de Oracle verbinding naar de database. Dat was echter met de oude MSDAORA driver, met
// de ORAOLEDB driver heb ik het (gelukkig) niet gezien. Was eigenlijk een bug denk ik.
var sql = "SELECT TO_NUMBER (TO_CHAR (TO_DATE('01-01-2018', 'DD-MM-YYYY'), 'D')) eikdag FROM DUAL";
var oRs = Oracle.Execute(sql);
var eikdag = oRs("eikdag").Value;
if (eikdag == 2)
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 }
return { result: resultcodes.ok, message: "January 1st 2018 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: "January 1st 2007 is not a monday<br>(since DB25 not problematic)", info: eikdag }
return { result: resultcodes.ok, message: "January 1st 2018 is not a monday<br>(since DB25 not problematic)", info: eikdag }
}
)
@@ -1177,29 +1182,6 @@ checker("CREATE VIEW privileges",
return { result: res, message: txt };
}
)
checker("Clocks",
function ()
{
var sql = "SELECT SYSDATE FROM DUAL";
var oRs = Oracle.Execute(sql);
var webdate = new Date();
var sysdate = new Date(oRs(0));
oRs.Close();
txt = "Oracle: " + toDateTimeString(sysdate) + "<br>"
+ "Webserver: " + toDateTimeString(webdate) + "<br>"
+ "<small>Difference ora-web: " + (Math.abs(sysdate - webdate) / 1000).toFixed(1) + "s</small><br>"
+ "Client: <span id='clienttime'></span>";
var res = resultcodes.ok;
if (Math.abs(sysdate - webdate) > 5*1000) // Meer dan 5 seconde? Waarschijnlijk geen synchronisatie
res = resultcodes.warning;
if (Math.abs(sysdate - webdate) > 30*1000) // Meer dan 30 seconde? Risicovol
res = resultcodes.error;
return { result: res, message: txt };
}
)
//------------------------------------------------------------------------------
__GROUP = "Installed Components";
checker("SLNKDWF Installed",
@@ -1223,9 +1205,9 @@ checker("SLNKDWF Installed",
+ "<br>usTimer: " + oSLNKDWF.usTimer
+ " (" + (oSLNKDWF.usTimer/1e6/60/60/24).toFixed(2) + " days uptime)";
if (oSLNKDWF.VersionMajor < 4 || oSLNKDWF.VersionMinor < 12)
if (oSLNKDWF.VersionMajor < 4 || oSLNKDWF.VersionMinor < 14)
{
txt += "<p><span style='font-style:normal'>Old version detected. Required version 4.12</p>";
txt += "<p><span style='font-style:normal'>Old version detected. Required version 4.14</p>";
return { result: resultcodes.error, message: txt, info: oSLNKDWF.VersionString };
}
@@ -1376,7 +1358,7 @@ checker("E-mail sending",
}
)
checker("Immediate E-mail test (requires SMTP service)",
checker("Immediate E-mail test",
function ()
{
try
@@ -1404,6 +1386,32 @@ checker("Immediate E-mail test (requires SMTP service)",
}
)
//------------------------------------------------------------------------------
__GROUP = "Miscellaneous";
checker("Clocks", // deze zo laat mogelijk zodat als straks de clientside clock er bij wordt gezocht
// deze zo goed mogelijk in de buurt zit.
function ()
{
var sql = "SELECT SYSTIMESTAMP FROM DUAL";
var oRs = Oracle.Execute(sql);
var sysdate = new Date(oRs(0));
var webdate = new Date();
oRs.Close();
txt = "Oracle: " + toDateTimeString(sysdate) + "." + padout(Math.round(sysdate.getMilliseconds()/10)) + "<br>"
+ "Webserver: " + toDateTimeString(webdate) + "." + padout(Math.round(webdate.getMilliseconds()/10)) + "<br>"
+ "<small>Difference ora-web: " + (Math.abs(sysdate - webdate) / 1000).toFixed(2) + "s</small><br>"
+ "Client: <span id='clienttime'></span>";
var res = resultcodes.ok;
if (Math.abs(sysdate - webdate) > 5*1000) // Meer dan 5 seconde? Waarschijnlijk geen synchronisatie
res = resultcodes.warning;
if (Math.abs(sysdate - webdate) > 30*1000) // Meer dan 30 seconde? Risicovol
res = resultcodes.error;
return { result: res, message: txt };
}
)
//New MSXML2.XSLTemplate40
// XML Processor var source = Server.CreateObject("MSXML2.DOMDocument.4.0");
// Let op: geconstateerd bij installatie DENB toen MSXML.MSI nog niet was geinstalleerd:
@@ -1508,7 +1516,7 @@ function DumpCollection(pCollection, title)
}
// Dit bestand moet geheel zelfvoorzienend worden (indien aangeroepen vanuit fac_verify.asp.inc)
// dus sommige handige functies maar herhalen
// dus sommige handige serverside functies maar herhalen
function padout(number) { return (number < 10) ? "0" + number : number; }
// Noot: altijd jaar vooraan, goed voor logfiles, niet bedoeld voor presentatie
function toDateString(jsDate)