bug fixes

[melted] / src / miracle / miracle_local.c

diff --git a/src/miracle/miracle_local.c b/src/miracle/miracle_local.c
index 51663d9..71b7b77 100644 (file)
--- a/src/miracle/miracle_local.c
+++ b/src/miracle/miracle_local.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <signal.h>
 #include <execinfo.h>
-#include <stdio.h>
 
 /* Valerie header files */
 #include <valerie/valerie_util.h>
@@ -295,19 +294,19 @@ static void sigsegv_handler()
        char **strings;
        size_t i;
 
-       fprintf( stderr, "\a\nMiracle experienced a segmentation fault.\n"
+       miracle_log( LOG_CRIT, "\a\nMiracle experienced a segmentation fault.\n"
                "Dumping stack from the offending thread\n\n" );
        size = backtrace( array, 10 );
        strings = backtrace_symbols( array, size );
 
-       fprintf( stderr, "Obtained %zd stack frames.\n", size );
+       miracle_log( LOG_CRIT, "Obtained %zd stack frames.\n", size );
 
        for ( i = 0; i < size; i++ )
-                fprintf( stderr, "%s\n", strings[ i ] );
+                miracle_log( LOG_CRIT, "%s", strings[ i ] );
 
        free( strings );
 
-       fprintf( stderr, "\nDone dumping - exiting.\n" );
+       miracle_log( LOG_CRIT, "\nDone dumping - exiting.\n" );
        exit( EXIT_FAILURE );
 }
 
@@ -331,7 +330,8 @@ static valerie_response miracle_local_connect( miracle_local local )
        signal( SIGPIPE, signal_handler );
        signal( SIGALRM, signal_handler );
        signal( SIGCHLD, SIG_IGN );
-       signal( SIGSEGV, sigsegv_handler );
+       if ( getenv( "MLT_SIGSEGV" ) )
+               signal( SIGSEGV, sigsegv_handler );
 
        return response;
 }