diff --git a/Controllers/OpsController.cs b/Controllers/OpsController.cs index 860d29b..2f0220d 100644 --- a/Controllers/OpsController.cs +++ b/Controllers/OpsController.cs @@ -37,38 +37,38 @@ namespace rockfishCore.Controllers switch (service) { case "MailMirror": - Ret.Status = true;//RfMail.MailIsMirroringProperly(); + Ret.Status = RfMail.MailIsMirroringProperly(); break; 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; case "APISite": - Ret.Status = true;// OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); + Ret.Status = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); break; 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; 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; 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; 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; 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; 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; case "Backup": - Ret.Status = false;//OpsDiagnostics.VerifyBackups(); + Ret.Status = OpsDiagnostics.VerifyBackups(); break; default: Ret.Status = false; - Ret.ServiceCheckError=$"Unknown service: \"{service}\""; + Ret.ServiceCheckError = $"Unknown service: \"{service}\""; break; } @@ -79,7 +79,6 @@ namespace rockfishCore.Controllers Ret.ServiceCheckError += $"{service}: {ex.Message}\r\n"; } -Ret.ServiceCheckError=$"test {service} error"; // try // { diff --git a/wwwroot/js/app.ops.js b/wwwroot/js/app.ops.js index de0849b..cd4df45 100644 --- a/wwwroot/js/app.ops.js +++ b/wwwroot/js/app.ops.js @@ -21,26 +21,15 @@ app.ops = (function() { //Generate list item // checkService = function(service) { - // var okClassFragment = okStatus - // ? "mdi-check-circle text-success" - // : "mdi-alert text-danger"; - - // return ( - // '

' + - // label + - // "

" - // ); - + app.api.get("ops/status/" + service, function(res) { if (res.error) { $.gevent.publish("app-show-error", res.msg); } else { - if (res.ServiceCheckError) { + if (res.serviceCheckError) { var errorText = $("#rf-ops-error").text(); errorText += "\r\n"; - errorText += res.ServiceCheckError; + errorText += res.serviceCheckError; $("#rf-ops-error").text(errorText); } @@ -51,10 +40,9 @@ app.ops = (function() { } else { serviceElement.addClass("mdi-alert text-danger"); } - //remove ? class and warning class - //add appropriate icon and text color class } }); + }; //-------------------- END UTILITY METHODS ------------------- @@ -81,17 +69,20 @@ app.ops = (function() { } $container.html(Handlebars.templates["app.ops"]({})); $("#rf-ops-error").text(""); - // $("#rf-ops-status").html("

Checking...

"); //Context menu app.nav.contextClear(); checkService("MailMirror"); checkService("AyaNovaSite"); - checkService("APISite"); + checkService("Backup"); checkService("ContactForm"); checkService("RequestForm"); - checkService("Backup"); + checkService("RequestLiteForm"); + checkService("Forum"); + checkService("Subversion"); + checkService("DevOps"); + checkService("APISite"); }; //PUBLIC METHODS