Merge pull request #1601 from FarmBot/log_fix

Prevent background workers from crashing when logs are deleted.
pull/1602/head
Rick Carlino 2019-11-26 08:25:44 -06:00 committed by GitHub
commit f5a9be23de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -40,7 +40,7 @@ class LogService < AbstractServiceRunner
def deliver(data)
dev, log = [data.device, data.payload]
dev.maybe_unthrottle
Log.deliver(dev, Logs::Create.run!(log, device: dev))
Log.deliver(Logs::Create.run!(log, device: dev).id)
print LOG_TPL % [data.device_id, data.payload["message"] || "??"]
rescue => x
Rollbar.error(x)

View File

@ -6,8 +6,9 @@ module LogDeliveryStuff
module ClassMethods
# If this method grows, create a mutation.
def deliver(device, log)
send_fatal_emails(log, device)
def deliver(log_id)
log = Log.find_by(id: log_id)
send_fatal_emails(log, log.device) if log
end
def send_fatal_emails(log, device)

View File

@ -53,7 +53,7 @@ module Logs
end
def maybe_deliver
Log.delay.deliver(device, @log)
Log.delay.deliver(@log.id)
end
def has_bad_words