From efe093ed745219b95775af0e0d8faaa66b93fa6f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 26 Jul 2018 22:54:37 +0000 Subject: [PATCH] --- notes/notes.txt | 4 ---- rockfishCore.csproj | 1 - util/OpsDiagnostics.cs | 42 +++++++++++++++++++++--------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/notes/notes.txt b/notes/notes.txt index 37fd40d..aab54c2 100644 --- a/notes/notes.txt +++ b/notes/notes.txt @@ -30,7 +30,3 @@ Mailkit (supposedly system.net.mail will be ported in v2.0 of .net core but for - - -uidnext {61644} {685} {61644} {685} -uidvalidity 1276936849 1532556097 1276936849 1532556097 \ No newline at end of file diff --git a/rockfishCore.csproj b/rockfishCore.csproj index 2bf1219..6467592 100644 --- a/rockfishCore.csproj +++ b/rockfishCore.csproj @@ -8,7 +8,6 @@ - diff --git a/util/OpsDiagnostics.cs b/util/OpsDiagnostics.cs index b425e00..c8cb9fd 100644 --- a/util/OpsDiagnostics.cs +++ b/util/OpsDiagnostics.cs @@ -1,24 +1,21 @@ using System; using System.Collections.Generic; -using System.Text; using System.Linq; -using System.IO; using System.Net.Http; -using System.Net.Http.Headers; using Amazon.S3; -using Amazon.S3.Transfer; namespace rockfishCore.Util { public static class OpsDiagnostics { - private const int S3_EXPECTED_FILE_COUNT=24; - public static readonly string[] S3_EXPECTED_BACKUP_FILE_PREFIXES = + private const int S3_EXPECTED_FILE_COUNT = 24; + public static readonly string[] S3_EXPECTED_BACKUP_FILE_PREFIXES = { "biz-docker-website-backup-", "biz-letsencryptbackup-", "biz-pecklist-db-backup-", "biz-rockfish-db-backup-", "devops-docker-le-config-backup-","forum-backup-", "mail-svn-repo-backup-" }; private const string S3_SECRET_KEY = "iNwbHr+sK+9is2wmRjIax+rdyEjLNvWKJBYr7w4txkY"; private const string S3_ACCESS_KEY = "CMPAFDNX53OWPC55HBJ4"; private const string S3_HOST_ENDPOINT = "https://nyc3.digitaloceanspaces.com"; + private const string S3_BUCKET_NAME = "gztw1"; private static HttpClient Client = new HttpClient(); @@ -41,34 +38,37 @@ namespace rockfishCore.Util public static List GetFileListFromSpacesBackupStorage() { - - AmazonS3Config clientConfig = new AmazonS3Config(); - clientConfig.ServiceURL = S3_HOST_ENDPOINT; - IAmazonS3 s3Client = new AmazonS3Client(S3_ACCESS_KEY, S3_SECRET_KEY, clientConfig); - var objectList = s3Client.ListObjectsAsync("gztw1").Result; - var fileList = objectList.S3Objects.Select(c => c.Key).ToList(); - return fileList; + AmazonS3Config ClientConfig = new AmazonS3Config(); + ClientConfig.ServiceURL = S3_HOST_ENDPOINT; + IAmazonS3 s3Client = new AmazonS3Client(S3_ACCESS_KEY, S3_SECRET_KEY, ClientConfig); + var ObjectList = s3Client.ListObjectsAsync(S3_BUCKET_NAME).Result; + var FileList = ObjectList.S3Objects.Select(c => c.Key).ToList(); + return FileList; } public static bool VerifyBackups() { - bool ret=false; + bool ret = false; var SpacesFileNames = GetFileListFromSpacesBackupStorage(); if (SpacesFileNames.Count != S3_EXPECTED_FILE_COUNT) return ret; //get yesterday's date in the same format as the backup creates - var ExpectedBackupDateString=DateTime.Today.AddDays(-1).ToString("yyMMdd"); - int foundMatches=0; - foreach(string ExpectedFileName in S3_EXPECTED_BACKUP_FILE_PREFIXES){ - foreach(string FileName in SpacesFileNames){ - if(FileName.StartsWith(ExpectedFileName+ExpectedBackupDateString)){ + var ExpectedBackupDateString = DateTime.Today.AddDays(-1).ToString("yyMMdd"); + int foundMatches = 0; + foreach (string ExpectedFileName in S3_EXPECTED_BACKUP_FILE_PREFIXES) + { + foreach (string FileName in SpacesFileNames) + { + if (FileName.StartsWith(ExpectedFileName + ExpectedBackupDateString)) + { foundMatches++; break; } } } - if(foundMatches==S3_EXPECTED_BACKUP_FILE_PREFIXES.Length){ - ret=true; + if (foundMatches == S3_EXPECTED_BACKUP_FILE_PREFIXES.Length) + { + ret = true; } return ret;