ulogd2/patches/0001-sqlite3-Add-more-logging-if-database-initialization-fails.patch

   1 From c3dbb53b6c206a0fdfacad9915a2df0c3613089a Mon Sep 17 00:00:00 2001
   2 From: Michael Tremer <michael.tremer@ipfire.org>
   3 Date: Sun, 22 Jul 2012 11:36:11 +0000
   4 Subject: [PATCH] sqlite3: Add more logging if database initialization fails.
   5
   6 ---
   7  output/sqlite3/ulogd_output_SQLITE3.c |    8 ++++++--
   8  1 files changed, 6 insertions(+), 2 deletions(-)
   9
  10 diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
  11 index dffdda3..6f371c3 100644
  12 --- a/output/sqlite3/ulogd_output_SQLITE3.c
  13 +++ b/output/sqlite3/ulogd_output_SQLITE3.c
  14 @@ -322,8 +322,10 @@ sqlite3_init_db(struct ulogd_pluginstance *pi)
  15         sqlite3_stmt *schema_stmt;
  16         int col, num_cols;
  17
  18 -       if (priv->dbh == NULL)
  19 +       if (priv->dbh == NULL) {
  20 +               ulogd_log(ULOGD_ERROR, "SQLITE3: No database handle.\n");
  21                 return -1;
  22 +       }
  23
  24         num_cols = db_count_cols(pi, &schema_stmt);
  25         if (num_cols <= 0) {
  26 @@ -397,8 +399,10 @@ sqlite3_start(struct ulogd_pluginstance *pi)
  27         sqlite3_busy_timeout(priv->dbh, SQLITE3_BUSY_TIMEOUT);
  28
  29         /* read the fieldnames to know which values to insert */
  30 -       if (sqlite3_init_db(pi) < 0)
  31 +       if (sqlite3_init_db(pi) < 0) {
  32 +               ulogd_log(ULOGD_ERROR, "SQLITE3: Could not read database fieldnames.\n");
  33                 return -1;
  34 +       }
  35
  36         /* initialize our buffer size and counter */
  37         priv->buffer_size = buffer_ce(pi);
  38 --
  39 1.7.8.2
  40