From b1400bcb684c43790dd38628b6c131e9e7c4d400 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 27 Nov 2019 21:49:36 -0500
Subject: fallback to Amazon S3 if saving a log to Pastebin fails

---
 src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs    | 10 +++++++++-
 .../Framework/Clients/Pastebin/PastebinClient.cs         |  2 +-
 src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Web/Framework')

diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
index 955156eb..bb2de356 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace StardewModdingAPI.Web.Framework.Clients.Pastebin
 {
     /// <summary>The response for a get-paste request.</summary>
@@ -9,7 +11,13 @@ namespace StardewModdingAPI.Web.Framework.Clients.Pastebin
         /// <summary>The fetched paste content (if <see cref="Success"/> is <c>true</c>).</summary>
         public string Content { get; set; }
 
-        /// <summary>The error message (if saving failed).</summary>
+        /// <summary>When the file will no longer be available.</summary>
+        public DateTime? Expiry { get; set; }
+
+        /// <summary>The error message if saving succeeded, but a non-blocking issue was encountered.</summary>
+        public string Warning { get; set; }
+
+        /// <summary>The error message if saving failed.</summary>
         public string Error { get; set; }
     }
 }
diff --git a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
index 2e8a8c68..d695aab6 100644
--- a/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs
@@ -62,7 +62,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Pastebin
             }
             catch (Exception ex)
             {
-                return new PasteInfo { Error = ex.ToString() };
+                return new PasteInfo { Error = $"Pastebin error: {ex}" };
             }
         }
 
diff --git a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
index 121690c5..7119ef03 100644
--- a/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
+++ b/src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs
@@ -13,6 +13,22 @@ namespace StardewModdingAPI.Web.Framework.ConfigModels
         public string UserAgent { get; set; }
 
 
+        /****
+        ** Amazon Web Services
+        ****/
+        /// <summary>The access key for AWS authentication.</summary>
+        public string AmazonAccessKey { get; set; }
+
+        /// <summary>The secret key for AWS authentication.</summary>
+        public string AmazonSecretKey { get; set; }
+
+        /// <summary>The AWS region endpoint (like 'us-east-1').</summary>
+        public string AmazonRegion { get; set; }
+
+        /// <summary>The AWS bucket in which to store temporary uploaded logs.</summary>
+        public string AmazonLogBucket { get; set; }
+
+
         /****
         ** Chucklefish
         ****/
-- 
cgit