ebl Tweak dump code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8034 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/cats/sql.c b/bacula/src/cats/sql.c
index 756c1e53d03ed01e27a472716a4b71ccb4475f17..bbee8561b840073c21884939587ba6c6b9c0eead 100644 (file)
--- a/bacula/src/cats/sql.c
+++ b/bacula/src/cats/sql.c
@@ -753,11 +753,11 @@ void _dbg_print_db(JCR *jcr, FILE *fp)
       return;
    }
 
-   fprintf(fp, "B_DB %p db_name=%s db_user=%s connected=%i\n",
+   fprintf(fp, "B_DB=%p db_name=%s db_user=%s connected=%i\n",
            mdb, NPRTB(mdb->db_name), NPRTB(mdb->db_user), mdb->connected);
    fprintf(fp, "\tcmd=\"%s\" changes=%i\n", NPRTB(mdb->cmd), mdb->changes);
    if (mdb->lock.valid == RWLOCK_VALID) { 
-      fprintf(fp, "\tRWLOCK %p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
+      fprintf(fp, "\tRWLOCK=%p w_active=%i w_wait=%i\n", &mdb->lock, mdb->lock.w_active, mdb->lock.w_wait);
 #ifndef HAVE_WIN32
       fprintf(fp, "\t\tthreadid=0x%x mutex=%p\n", (int)mdb->lock.writer_id, &mdb->lock.mutex);
 #endif

diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c
index 941c6f709185dabd92ab27ee4413f6ea6925410f..01fbecc7cc6243ef0960329122da8ae4b25508d6 100644 (file)
--- a/bacula/src/lib/signal.c
+++ b/bacula/src/lib/signal.c
@@ -87,12 +87,14 @@ static void dbg_print_bacula()
 {
    char buf[512];
 
-   snprintf(buf, sizeof(buf), "%s/bacula.%d.bactrace", 
-            working_directory, getpid());
+   snprintf(buf, sizeof(buf), "%s/%s.%d.bactrace", 
+            working_directory, my_name, getpid());
    FILE *fp = fopen(buf, "ab") ;
    if (!fp) {
       fp = stderr;
    }
+   
+   fprintf(stderr, "Dumping: %s\n", buf);
 
    /* Print also B_DB and RWLOCK structure 
     * Can add more info about JCR with dbg_jcr_add_hook()
@@ -212,9 +214,9 @@ extern "C" void signal_handler(int sig)
          bmicrosleep(30, 0);
       }
       fprintf(stderr, _("It looks like the traceback worked ...\n"));
+      dbg_print_bacula();
    }
 #endif
-
    exit_handler(sig);
 }