Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions lib/entity_store/event_bus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def send_to_subscriber subscriber, receiver_name, event
subscriber.new.send(receiver_name, event)
log_debug { "called #{subscriber.name}##{receiver_name} with #{event.inspect}" }
rescue => e
log_error "#{e.message} when calling #{subscriber.name}##{receiver_name} with #{event.inspect}", e
log_error "#{subscriber.name}##{receiver_name} failed - #{e.class} - #{e.message} - entity=#{event.entity_id}, version=#{event.entity_version}", e
end

def subscribers_to(event_name)
Expand Down Expand Up @@ -61,9 +61,9 @@ def replay(since, type, subscriber)
begin
event = EntityStore::Config.load_type(event_data_object.type).new(event_data_object.attrs)
subscriber.new.send(event.receiver_name, event)
log_info { "replayed #{event.inspect} to #{subscriber.name}##{event.receiver_name}" }
log_debug { "replayed #{event.inspect} to #{subscriber.name}##{event.receiver_name}" }
rescue => e
log_error "#{e.message} when replaying #{event_data_object.inspect} to #{subscriber}", e
log_error "#{subscriber.name}##{event.receiver_name} replay failed - #{e.class} - #{e.message} - entity=#{event.entity_id}, version=#{event.entity_version}", e
end
end
event_data_objects = feed_store.get_events(event_data_objects.last.id, type, max_items)
Expand Down
5 changes: 1 addition & 4 deletions lib/entity_store/logging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ module Logging
end

def log_error(message, exception)
if Config.logger
Config.logger.error message
Config.logger.error exception.backtrace.join("\n\t")
end
Config.logger.error(message, exception) if Config.logger
end
end
end
10 changes: 5 additions & 5 deletions lib/entity_store/store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ def add(entity)

entity
rescue => e
logger.error { "Store#add error: #{e.inspect} - #{entity.inspect}" }
raise e
log_error "Store#add error - id=#{entity.id} (#{entity.class}) - #{e.class} - #{e.message}", e
raise
end

def save(entity)
Expand All @@ -40,8 +40,8 @@ def save(entity)
end
entity
rescue => e
log_error "Store#save error: #{e.inspect} - #{entity.inspect}", e
raise e
log_error "Store#save error - id=#{entity.id} (#{entity.class}) - #{e.class} - #{e.message}", e
raise
end

def snapshot_entity(entity)
Expand Down Expand Up @@ -120,7 +120,7 @@ def get_with_ids(ids, options={})
entity.apply_event(event)
log_debug { "Applied #{event.inspect} to #{id}" }
rescue => e
log_error "Failed to apply #{event.class.name} #{event.attributes} to #{id} with #{e.inspect}", e
log_error "Failed to apply #{event.class.name} - #{e.class} - #{e.message} - entity=#{id}, version=#{event.entity_version}", e
raise if options.fetch(:raise_exception, true)
end
entity.version = event.entity_version
Expand Down
2 changes: 1 addition & 1 deletion lib/entity_store/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module EntityStore
VERSION = "1.2.0".freeze
VERSION = "2.0.0".freeze
end