mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2025-08-12 17:26:58 +02:00
Code Issues Projects Releases Wiki Activity

Some more error handling.

Browse Source
This commit is contained in:
Dimitri Fontaine 2013-11-07 23:17:00 +01:00
parent 4095b74db7
commit a9d160dc32
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.lisp
View File

@ -72,7 +72,9 @@
((condition ((condition
#'(lambda (c) #'(lambda (c)
(if debug (if debug
(trivial-backtrace:print-backtrace c :verbose t) (trivial-backtrace:print-backtrace c
:output *standard-output*
:verbose t)
(trivial-backtrace:print-condition c *standard-output*))))) (trivial-backtrace:print-condition c *standard-output*)))))
(let ((min-messages (cond (debug :debug) (let ((min-messages (cond (debug :debug)
(verbose :info) (verbose :info)

12
src/pgsql/queries.lisp
View File

@ -52,16 +52,20 @@
(declare (ignore res)) (declare (ignore res))
(pgstate-incf state label :rows count :secs secs))) (pgstate-incf state label :rows count :secs secs)))
;;;
;;; PostgreSQL queries
;;;
(defun pgsql-execute (sql &key ((:client-min-messages level))) (defun pgsql-execute (sql &key ((:client-min-messages level)))
"Execute given SQL in current transaction" "Execute given SQL in current transaction"
(when level (when level
(pomo:execute (pomo:execute
(format nil "SET LOCAL client_min_messages TO ~a;" (symbol-name level)))) (format nil "SET LOCAL client_min_messages TO ~a;" (symbol-name level))))
(pomo:execute sql) (handler-case
;; execute the query, catching errors and warnings
(pgsql-execute sql)
(cl-postgres:database-error (e)
(log-message :error "~a" e))
(cl-postgres:postgresql-warning (w)
(log-message :warning "~a" w)))
(when level (pomo:execute (format nil "RESET client_min_messages;")))) (when level (pomo:execute (format nil "RESET client_min_messages;"))))