Skip to content

Handle news connection failure #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Handle news connection failure #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbaa66e
Handle news connection failure
jmthomas Feb 25, 2025
ba1c21a
Rescue settings_api
jmthomas Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion openc3/lib/openc3/api/settings_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 3 additions & 1 deletion openc3/lib/openc3/microservices/periodic_microservice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions openc3/lib/openc3/models/news_model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading