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

Browse Source
This commit is contained in:
John Cardinal
2018-07-27 20:41:02 +00:00
parent c4a9e27b5f
commit 20e1c70e34
2 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Controllers/OpsController.cs
View File

@@ -37,38 +37,38 @@ namespace rockfishCore.Controllers
switch (service) switch (service)
{ {
case "MailMirror": case "MailMirror":
Ret.Status = true;//RfMail.MailIsMirroringProperly(); Ret.Status = RfMail.MailIsMirroringProperly();
break; break;
case "AyaNovaSite": case "AyaNovaSite":
Ret.Status = false;//OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc."); Ret.Status = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc.");
break; break;
case "APISite": case "APISite":
Ret.Status = true;// OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); Ret.Status = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration");
break; break;
case "ContactForm": case "ContactForm":
Ret.Status = false; //OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/contact", "Contact.Email"); Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/contact", "Contact.Email");
break; break;
case "RequestForm": case "RequestForm":
Ret.Status = true;// OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email"); Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email");
break; break;
case "RequestLiteForm": case "RequestLiteForm":
Ret.Status = false; //OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email"); Ret.Status = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email");
break; break;
case "Subversion": case "Subversion":
Ret.Status = true; //OpsDiagnostics.CheckWebsite("http://svn.helloayanova.com:3343/csvn/login/auth", "Subversion Edge"); Ret.Status = OpsDiagnostics.CheckWebsite("http://svn.helloayanova.com:3343/csvn/login/auth", "Subversion Edge");
break; break;
case "Forum": case "Forum":
Ret.Status = false; //OpsDiagnostics.CheckWebsite("http://forum.ayanova.com/", "AyaNova support resources"); Ret.Status = OpsDiagnostics.CheckWebsite("http://forum.ayanova.com/", "AyaNova support resources");
break; break;
case "DevOps": case "DevOps":
Ret.Status = true; //OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server"); Ret.Status = OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server");
break; break;
case "Backup": case "Backup":
Ret.Status = false;//OpsDiagnostics.VerifyBackups(); Ret.Status = OpsDiagnostics.VerifyBackups();
break; break;
default: default:
Ret.Status = false; Ret.Status = false;
Ret.ServiceCheckError=$"Unknown service: \"{service}\""; Ret.ServiceCheckError = $"Unknown service: \"{service}\"";
break; break;
} }
@@ -79,7 +79,6 @@ namespace rockfishCore.Controllers
Ret.ServiceCheckError += $"{service}: {ex.Message}\r\n"; Ret.ServiceCheckError += $"{service}: {ex.Message}\r\n";
} }
Ret.ServiceCheckError=$"test {service} error";
// try // try
// { // {

29
wwwroot/js/app.ops.js
View File

@@ -21,26 +21,15 @@ app.ops = (function() {
//Generate list item //Generate list item
// //
checkService = function(service) { checkService = function(service) {
// var okClassFragment = okStatus
// ? "mdi-check-circle text-success"
// : "mdi-alert text-danger";
// return (
// '<h4><i class="mdi mdi-36px ' +
// okClassFragment +
// '"></i> ' +
// label +
// "</h4>"
// );
app.api.get("ops/status/" + service, function(res) { app.api.get("ops/status/" + service, function(res) {
if (res.error) { if (res.error) {
$.gevent.publish("app-show-error", res.msg); $.gevent.publish("app-show-error", res.msg);
} else { } else {
if (res.ServiceCheckError) { if (res.serviceCheckError) {
var errorText = $("#rf-ops-error").text(); var errorText = $("#rf-ops-error").text();
errorText += "\r\n"; errorText += "\r\n";
errorText += res.ServiceCheckError; errorText += res.serviceCheckError;
$("#rf-ops-error").text(errorText); $("#rf-ops-error").text(errorText);
} }
@@ -51,10 +40,9 @@ app.ops = (function() {
} else { } else {
serviceElement.addClass("mdi-alert text-danger"); serviceElement.addClass("mdi-alert text-danger");
} }
//remove ? class and warning class
//add appropriate icon and text color class
} }
}); });
}; };
//-------------------- END UTILITY METHODS ------------------- //-------------------- END UTILITY METHODS -------------------
@@ -81,17 +69,20 @@ app.ops = (function() {
} }
$container.html(Handlebars.templates["app.ops"]({})); $container.html(Handlebars.templates["app.ops"]({}));
$("#rf-ops-error").text(""); $("#rf-ops-error").text("");
// $("#rf-ops-status").html("<h4>Checking...</h4>");
//Context menu //Context menu
app.nav.contextClear(); app.nav.contextClear();
checkService("MailMirror"); checkService("MailMirror");
checkService("AyaNovaSite"); checkService("AyaNovaSite");
checkService("APISite"); checkService("Backup");
checkService("ContactForm"); checkService("ContactForm");
checkService("RequestForm"); checkService("RequestForm");
checkService("Backup"); checkService("RequestLiteForm");
checkService("Forum");
checkService("Subversion");
checkService("DevOps");
checkService("APISite");
}; };
//PUBLIC METHODS //PUBLIC METHODS