aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-22 09:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle non existing accounts.json gracefully

Browse Source 
see #363
This commit is contained in:
Bernhard B
2023-05-16 21:24:42 +02:00
parent 0dd742cb23
commit 99c760df66
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.go
View File

@@ -270,7 +270,15 @@ func main() {
Accounts []SignalCliAccountConfig `json:"accounts"` Accounts []SignalCliAccountConfig `json:"accounts"`
} }
signalCliConfigJsonData, err := ioutil.ReadFile(*signalCliConfig + "/data/accounts.json") autoReceiveScheduleReceiveTimeout := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_RECEIVE_TIMEOUT", "10")
autoReceiveScheduleIgnoreAttachments := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_ATTACHMENTS", "false")
autoReceiveScheduleIgnoreStories := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_STORIES", "false")
c := cron.New()
c.Schedule(schedule, cron.FuncJob(func() {
accountsJsonPath := *signalCliConfig + "/data/accounts.json"
if _, err := os.Stat(accountsJsonPath); err == nil {
signalCliConfigJsonData, err := ioutil.ReadFile(accountsJsonPath)
if err != nil { if err != nil {
log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't read accounts.json: ", err.Error()) log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't read accounts.json: ", err.Error())
} }
@@ -280,18 +288,11 @@ func main() {
log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't parse accounts.json: ", err.Error()) log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't parse accounts.json: ", err.Error())
} }
autoReceiveScheduleReceiveTimeout := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_RECEIVE_TIMEOUT", "10")
autoReceiveScheduleIgnoreAttachments := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_ATTACHMENTS", "false")
autoReceiveScheduleIgnoreStories := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_STORIES", "false")
c := cron.New()
c.Schedule(schedule, cron.FuncJob(func() {
for _, account := range signalCliAccountConfigs.Accounts { for _, account := range signalCliAccountConfigs.Accounts {
client := &http.Client{} client := &http.Client{}
log.Debug("AUTO_RECEIVE_SCHEDULE: Calling receive for number ", account.Number) log.Debug("AUTO_RECEIVE_SCHEDULE: Calling receive for number ", account.Number)
req, err := http.NewRequest("GET", "http://127.0.0.1:" + port + "/v1/receive/" + account.Number, nil) req, err := http.NewRequest("GET", "http://127.0.0.1:"+port+"/v1/receive/"+account.Number, nil)
if err != nil { if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error()) log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error())
} }
@@ -328,6 +329,9 @@ func main() {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", receiveResponse) log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", receiveResponse)
} }
} }
} else {
log.Info("AUTO_RECEIVE_SCHEDULE: accounts.json doesn't exist")
}
})) }))
c.Start() c.Start()
} }