Merge pull request #1920 from OpenC3/news

Author: jmthomas

openc3/lib/openc3/api/settings_api.rb

@@ -91,7 +91,7 @@ def update_news(manual: false, scope: $openc3_scope, token: $openc3_token)
       if response.success?
         NewsModel.set(response.body)
       else
-        NewsModel.news_error(response)
+        NewsModel.news_error("Error contacting OpenC3 news feed (status: #{response.status})")
       end
 
       # Test code to update the news feed with a dummy message
@@ -100,6 +100,8 @@ def update_news(manual: false, scope: $openc3_scope, token: $openc3_token)
       # json.unshift( { date: Time.now.utc.iso8601, title: "News at #{Time.now}", body: "The news feed has been updated at #{Time.now}." })
       # json.pop if json.length > 5
       # NewsModel.set(json.to_json)
+    rescue Exception => e
+      NewsModel.news_error("Error contacting OpenC3 news feed. #{e.message})")
     end
   end
 end

openc3/lib/openc3/microservices/periodic_microservice.rb

@@ -48,9 +48,11 @@ def get_news
         if response.success?
           NewsModel.set(response.body)
         else
-          NewsModel.news_error(response)
+          NewsModel.news_error("Error contacting OpenC3 news feed (status: #{response.status})")
         end
       end
+    rescue Exception => e
+      NewsModel.news_error("Error contacting OpenC3 news feed. #{e.message})")
     end
 
     def run

openc3/lib/openc3/models/news_model.rb

@@ -31,8 +31,12 @@ def self.all()
       Store.get(PRIMARY_KEY)
     end
 
-    def self.news_error(response)
-      Store.set(PRIMARY_KEY, [{ date: Time.now.utc.iso8601, title: 'News Error', body: "Error contacting OpenC3 news feed (status: #{response.status})" }].to_json)
+    def self.news_error(message)
+      Store.set(PRIMARY_KEY, [{
+        date: Time.now.utc.iso8601,
+        title: 'News Error',
+        body: message
+      }].to_json)
     end
   end
 end