From 991c17dc2dd4b8df1f7d72aaa54bdb2ce4639fb4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 27 Jul 2018 18:32:02 +0000 Subject: [PATCH] --- Controllers/OpsController.cs | 194 +++++++++++------------- wwwroot/js/app.ops.js | 26 +++- wwwroot/js/templates/app.ops.handlebars | 17 +-- wwwroot/js/templates/templates.js | 4 +- 4 files changed, 112 insertions(+), 129 deletions(-) diff --git a/Controllers/OpsController.cs b/Controllers/OpsController.cs index 9ddbc16..97ea908 100644 --- a/Controllers/OpsController.cs +++ b/Controllers/OpsController.cs @@ -31,117 +31,101 @@ namespace rockfishCore.Controllers { dtoOpsStatus Ret = new dtoOpsStatus(); + //TESTING Ret.OpsCheckError="Fake error message\r\nwith more fake text\r\neot"; - - try - { - Ret.MailMirrorOK = RfMail.MailIsMirroringProperly(); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Mail mirror: {ex.Message}\r\n"; - } - - try - { - Ret.AyaNovaSiteOK = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc."); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"AyaNova site: {ex.Message}\r\n"; - } - - try - { - Ret.APISiteOK = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"API site: {ex.Message}\r\n"; - } - - try - { - Ret.ContactFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/contact", "Contact.Email"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Contact form: {ex.Message}\r\n"; - } - - try - { - Ret.RequestFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Request form: {ex.Message}\r\n"; - } - - try - { - Ret.RequestLiteFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"RequestLite form: {ex.Message}\r\n"; - } - - try - { - Ret.SubversionOK = OpsDiagnostics.CheckWebsite("http://svn.helloayanova.com:3343/csvn/login/auth", "Subversion Edge"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Subversion: {ex.Message}\r\n"; - } - - try - { - Ret.ForumOK = OpsDiagnostics.CheckWebsite("http://forum.ayanova.com/", "AyaNova support resources"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Forum: {ex.Message}\r\n"; - } - - try - { - Ret.DevOpsOK = OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server"); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"DevOps: {ex.Message}\r\n"; - } - - try - { - Ret.BackupOK = OpsDiagnostics.VerifyBackups(); - } - catch (Exception ex) - { - Ret.OpsCheckError += $"Backup: {ex.Message}\r\n"; - } + Ret.MailMirrorOK=true; + Ret.ContactFormOK=true; + // try + // { + // Ret.MailMirrorOK = RfMail.MailIsMirroringProperly(); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Mail mirror: {ex.Message}\r\n"; + // } - //PING? - //Can ping Spaces and all the servers we have, maybe do that first then proceed - //https://docs.microsoft.com/en-us/dotnet/framework/network-programming/how-to-ping-a-host - //using System.Net.NetworkInformation; + // try + // { + // Ret.AyaNovaSiteOK = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc."); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"AyaNova site: {ex.Message}\r\n"; + // } - //AyaNova website: https://www.ayanova.com/ - //API website: https://api.ayanova.com/ - //Contact form: https://contact.ayanova.com/contact - //Request form: https://contact.ayanova.com/request - //Request lite form: https://contact.ayanova.com/requestlite - //subversion admin: http://svn.helloayanova.com:3343/csvn/login/auth - //Forum: http://forum.ayanova.com/ - //devops: https://test.helloayanova.com/api/v8/ - //Spaces and backup: https://gztw1.nyc3.digitaloceanspaces.com/ - //confirm expected backup files are present - + // try + // { + // Ret.APISiteOK = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"API site: {ex.Message}\r\n"; + // } + // try + // { + // Ret.ContactFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/contact", "Contact.Email"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Contact form: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.RequestFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/request", "Contact.Email"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Request form: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.RequestLiteFormOK = OpsDiagnostics.CheckWebsite("https://contact.ayanova.com/requestlite", "Contact.Email"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"RequestLite form: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.SubversionOK = OpsDiagnostics.CheckWebsite("http://svn.helloayanova.com:3343/csvn/login/auth", "Subversion Edge"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Subversion: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.ForumOK = OpsDiagnostics.CheckWebsite("http://forum.ayanova.com/", "AyaNova support resources"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Forum: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.DevOpsOK = OpsDiagnostics.CheckWebsite("https://test.helloayanova.com/api/v8/", "AyaNova server"); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"DevOps: {ex.Message}\r\n"; + // } + + // try + // { + // Ret.BackupOK = OpsDiagnostics.VerifyBackups(); + // } + // catch (Exception ex) + // { + // Ret.OpsCheckError += $"Backup: {ex.Message}\r\n"; + // } return Ret; } diff --git a/wwwroot/js/app.ops.js b/wwwroot/js/app.ops.js index de41757..750e774 100644 --- a/wwwroot/js/app.ops.js +++ b/wwwroot/js/app.ops.js @@ -75,20 +75,32 @@ app.ops = (function() { app.nav.contextClear(); app.api.get("ops/status/", function(res) { + $("#rf-ops-error").text(""); + $("#rf-ops-status").html("

Checking...

"); if (res.error) { $.gevent.publish("app-show-error", res.msg); } else { - if (res.opsCheckMessage) { - $("#about").append("

Ops status response: " + res.opsCheckMessage + "

"); + + if (res.opsCheckError) { + $("#rf-ops-error").text(res.opsCheckError); } - - //set classes - - + $("#rf-ops-status").html("

Results:

"); + } }); - //{"mailMirrorOK":true,"forumOK":true,"ayaNovaWebsiteOK":true,"apiWebsiteOK":true,"contactFormOK":true,"requestFormOK":true,"requestLiteFormOK":true,"subversionOK":true,"devOpsOK":true,"backupOK":true,"opsCheckMessage":""} + /* +

+ + AyaNova site +

+ +

+ + Contact form +

+ */ + //{"mailMirrorOK":true,"forumOK":true,"ayaNovaSiteOK":true,"apiSiteOK":true,"contactFormOK":true,"requestFormOK":true,"requestLiteFormOK":true,"subversionOK":true,"devOpsOK":true,"backupOK":true,"opsCheckError":"Fake error message\r\nwith more fake text\r\neot"} //icons: alert for bad, check-circle for good }; diff --git a/wwwroot/js/templates/app.ops.handlebars b/wwwroot/js/templates/app.ops.handlebars index bb8e6bd..8ece560 100644 --- a/wwwroot/js/templates/app.ops.handlebars +++ b/wwwroot/js/templates/app.ops.handlebars @@ -1,18 +1,5 @@
-

OPS

-
-
- -

- AyaNova site -

- -

- - API site -

- - +

+
\ No newline at end of file diff --git a/wwwroot/js/templates/templates.js b/wwwroot/js/templates/templates.js index 8965dbe..c55c9cc 100644 --- a/wwwroot/js/templates/templates.js +++ b/wwwroot/js/templates/templates.js @@ -1,2 +1,2 @@ -!function(){var n=Handlebars.template,e=Handlebars.templates=Handlebars.templates||{};e["app.authenticate"]=n({compiler:[7,">= 4.0.0"],main:function(n,e,a,l,i){return'
\n Rockfish logo\n

Login

\n
\n

\n

\n

\n
\n
'},useData:!0}),e["app.customerEdit"]=n({compiler:[7,">= 4.0.0"],main:function(n,e,a,l,i){return'
\n
\n\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n
\n\n\n
\n \n
\n\n\n\n
\n \n