Skip to content
New issue

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

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

Already on GitHub? # to your account

Log failed queries #326

Merged
merged 1 commit into from
Mar 16, 2020
Merged
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
7 changes: 7 additions & 0 deletions spec/spec_helper.cr
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ Spec.before_each do
TestDatabase.truncate
end

logger = Dexter::Logger.new(STDERR, level: Logger::Severity::ERROR)

Avram.configure do |settings|
settings.logger = logger
settings.query_failed_log_level = Logger::Severity::ERROR
end

class SampleBackupDatabase < Avram::Database
end

Expand Down
1 change: 1 addition & 0 deletions src/avram.cr
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module Avram
setting logger : Dexter::Logger = Dexter::Logger.new(nil)
setting query_log_level : ::Logger::Severity?
setting save_failed_log_level : ::Logger::Severity? = ::Logger::Severity::WARN
setting query_failed_log_level : ::Logger::Severity? = ::Logger::Severity::ERROR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, that makes more sense 😅

setting database_to_migrate : Avram::Database.class, example: "AppDatabase"
setting time_formats : Array(String) = [] of String
end
Expand Down
23 changes: 23 additions & 0 deletions src/avram/pool_statement_logging.cr
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,41 @@ module DB
def exec : ExecResult
log_query
statement_with_retry &.exec
rescue e : PQ::PQError
log_error
raise e
end

def exec(*args_, args : Array? = nil) : ExecResult
log_query(*args_, args: args)
statement_with_retry &.exec(*args_, args: args)
rescue e : PQ::PQError
log_error(*args_, args: args)
raise e
end

def query : ResultSet
log_query
statement_with_retry &.query
rescue e : PQ::PQError
log_error
raise e
end

def query(*args_, args : Array? = nil) : ResultSet
log_query(*args_, args: args)
statement_with_retry &.query(*args_, args: args)
rescue e : PQ::PQError
log_error(*args_, args: args)
raise e
end

def scalar(*args_, args : Array? = nil)
log_query(*args_, args: args)
statement_with_retry &.scalar(*args_, args: args)
rescue e : PQ::PQError
log_error(*args_, args: args)
raise e
end

private def log_query(*args_, args : Array? = nil)
Expand All @@ -32,5 +47,13 @@ module DB
Avram.logger.log(level, {query: @query, args: logging_args})
end
end

private def log_error(*args_, args : Array? = nil)
Avram.settings.query_failed_log_level.try do |level|
logging_args = EnumerableConcat.build(args_, args)
logging_args = logging_args.to_a if logging_args.is_a?(EnumerableConcat)
Avram.logger.log(level, {failed_query: @query, args: logging_args})
end
end
end
end