diff options
| author | Werner Koch <wk@gnupg.org> | 2010-03-11 13:34:11 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-03-11 13:34:11 +0100 |
| commit | 37870234a195fb76f36284ac4bdb5dc172078724 (patch) | |
| tree | f65b4c42925edb20ff4149a977d12a4d31d432a0 /g13 | |
| parent | Change logging to use estream. The makes logging to a socket also (diff) | |
| download | gnupg2-37870234a195fb76f36284ac4bdb5dc172078724.tar.xz gnupg2-37870234a195fb76f36284ac4bdb5dc172078724.zip | |
Use a custom log handler for libassuan.
Diffstat (limited to 'g13')
| -rw-r--r-- | g13/ChangeLog | 2 | ||||
| -rw-r--r-- | g13/g13.c | 8 | ||||
| -rw-r--r-- | g13/server.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/g13/ChangeLog b/g13/ChangeLog index b263b8403..cc51472cc 100644 --- a/g13/ChangeLog +++ b/g13/ChangeLog @@ -1,4 +1,4 @@ -009-11-04 Werner Koch <wk@g10code.com> +2009-11-04 Werner Koch <wk@g10code.com> Under initial development - no need for a ChangeLog. @@ -35,6 +35,7 @@ #include "i18n.h" #include "sysutils.h" #include "gc-opt-flags.h" +#include "asshelp.h" #include "keyblob.h" #include "server.h" #include "runner.h" @@ -432,10 +433,9 @@ main ( int argc, char **argv) } /* Prepare libassuan. */ - assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_system_hooks (ASSUAN_SYSTEM_PTH); - + setup_libassuan_logging (&opt.debug); /* Setup a default control structure for command line mode. */ memset (&ctrl, 0, sizeof ctrl); @@ -799,7 +799,9 @@ handle_signal (int signo) case SIGUSR1: log_info ("SIGUSR1 received - printing internal information:\n"); - pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); + /* Fixme: We need to see how to integrate pth dumping into our + logging system. */ + /* pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); */ mountinfo_dump_all (); break; diff --git a/g13/server.c b/g13/server.c index 76bfdf486..0c2b880f4 100644 --- a/g13/server.c +++ b/g13/server.c @@ -642,9 +642,6 @@ g13_server (ctrl_t ctrl) } ctrl->server_local->assuan_ctx = ctx; - if (DBG_ASSUAN) - assuan_set_log_stream (ctx, log_get_stream ()); - while ( !(err = assuan_accept (ctx)) ) { err = assuan_process (ctx); |