Replace fatal errors with non-fatal logging to improve resilience
Version bump to 0.2.1. Changed log.Fatalln calls to log.Println with continue/return so that individual API errors no longer crash the entire service.
This commit is contained in:
parent
b6777746e4
commit
6857622c26
2
main.go
2
main.go
@ -13,7 +13,7 @@ import (
|
|||||||
const (
|
const (
|
||||||
serviceName = "service-notifications"
|
serviceName = "service-notifications"
|
||||||
serviceDescription = "Notifications for church services"
|
serviceDescription = "Notifications for church services"
|
||||||
serviceVersion = "0.2"
|
serviceVersion = "0.2.1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// App is the global application structure for communicating between servers and storing information.
|
// App is the global application structure for communicating between servers and storing information.
|
||||||
|
|||||||
21
update.go
21
update.go
@ -110,7 +110,8 @@ func UpdatePCData() {
|
|||||||
// Get the plans for this service type.
|
// Get the plans for this service type.
|
||||||
allPlans, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans", serviceTypeID))
|
allPlans, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans", serviceTypeID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Println("Error getting plans for service type:", serviceTypeID, err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
// For each plan, update data in database and pull other plan releated items for updates.
|
// For each plan, update data in database and pull other plan releated items for updates.
|
||||||
for _, data := range allPlans {
|
for _, data := range allPlans {
|
||||||
@ -152,7 +153,8 @@ func UpdatePCData() {
|
|||||||
// Get all times for this plan.
|
// Get all times for this plan.
|
||||||
allPlanTimes, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/plan_times", serviceTypeID, planID))
|
allPlanTimes, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/plan_times", serviceTypeID, planID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Println("Error getting plan times for plan:", planID, err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
// With each time, save it to the database.
|
// With each time, save it to the database.
|
||||||
for _, data := range allPlanTimes {
|
for _, data := range allPlanTimes {
|
||||||
@ -188,7 +190,8 @@ func UpdatePCData() {
|
|||||||
// Get all members of the plan.
|
// Get all members of the plan.
|
||||||
allTeamMembers, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/team_members", serviceTypeID, planID))
|
allTeamMembers, err := PCGetAll(fmt.Sprintf("/services/v2/service_types/%d/plans/%d/team_members", serviceTypeID, planID))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Println("Error getting team members for plan:", planID, err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
// With each member, update the database.
|
// With each member, update the database.
|
||||||
for _, data := range allTeamMembers {
|
for _, data := range allTeamMembers {
|
||||||
@ -226,11 +229,13 @@ func UpdateSlackData() {
|
|||||||
// Get all users from Slack.
|
// Get all users from Slack.
|
||||||
users, err := app.slack.GetUsers()
|
users, err := app.slack.GetUsers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln(err)
|
log.Println("Error getting Slack users:", err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
// If no users returned, error as we should have some...
|
// If no users returned, error as we should have some...
|
||||||
if len(users) == 0 {
|
if len(users) == 0 {
|
||||||
log.Fatalln("No users found in Slack.")
|
log.Println("No users found in Slack.")
|
||||||
|
return
|
||||||
}
|
}
|
||||||
// With each user, update the database.
|
// With each user, update the database.
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
@ -354,7 +359,8 @@ func CreateSlackChannels() {
|
|||||||
app.db.Where("time_type='service' AND starts_at > ? AND starts_at < ?", startDate, lastDate).Find(&planTimes)
|
app.db.Where("time_type='service' AND starts_at > ? AND starts_at < ?", startDate, lastDate).Find(&planTimes)
|
||||||
// If no plan times matched, exit here.
|
// If no plan times matched, exit here.
|
||||||
if len(planTimes) == 0 {
|
if len(planTimes) == 0 {
|
||||||
log.Fatalln("No services found for this time frame.")
|
log.Println("No services found for this time frame.")
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// With each plan time found, create a slack channel.
|
// With each plan time found, create a slack channel.
|
||||||
@ -432,7 +438,8 @@ func CreateSlackChannels() {
|
|||||||
log.Println("Creating channel:", channel.Name)
|
log.Println("Creating channel:", channel.Name)
|
||||||
schan, err := app.slack.CreateConversation(channelInfo)
|
schan, err := app.slack.CreateConversation(channelInfo)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln("Failed to create channel:", err)
|
log.Println("Failed to create channel:", err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// If topic is defined, set the topic and purpose.
|
// If topic is defined, set the topic and purpose.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user