cscvs to tla changeset 123

Author: noodles
Date: 2004/05/26 18:53:14
Add logging for the various CGI interfaces.

diff --git a/add.c b/add.c
index f90dd88be53a10d7e809ea7e2ecb30fe71f4a298..2aba92216a39893c362aad6f16ed5264437cd730 100644 (file)
--- a/add.c
+++ b/add.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: add.c,v 1.12 2004/03/23 12:33:46 noodles Exp $
+ * $Id: add.c,v 1.13 2004/05/26 18:53:14 noodles Exp $

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>


@@ -27,11 +27,12 @@
 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-       struct openpgp_packet_list *packets = NULL;
-       struct openpgp_publickey *keys = NULL;
-       char **params = NULL;
-       struct buffer_ctx ctx;
-       int i;
+       struct openpgp_packet_list  *packets = NULL;
+       struct openpgp_publickey    *keys = NULL;
+       char                       **params = NULL;
+       struct buffer_ctx            ctx;
+       int                          count = 0;
+       int                          i;

 
        memset(&ctx, 0, sizeof(ctx));
 
 
        memset(&ctx, 0, sizeof(ctx));
 


@@ -64,8 +65,10 @@ int main(int argc, char *argv[])
                if (packets != NULL) {
                        parse_keys(packets, &keys);
                        initdb(false);
                if (packets != NULL) {
                        parse_keys(packets, &keys);
                        initdb(false);

-                       printf("Got %d new keys.\n",
-                                       update_keys(&keys));
+                       count = update_keys(&keys);
+                       printf("Got %d new keys.\n", count);
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                               count);

                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);
                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);

diff --git a/gpgwww.c b/gpgwww.c
index fa8ea4f952eb8024003a547c9d6aa0a896f2f391..4668239bb3334347cbcf7be8c933a1e662a6346a 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2001-2002 Project Purple.
  *
  *
  * Copyright 2001-2002 Project Purple.
  *

- * $Id: gpgwww.c,v 1.13 2004/03/23 12:33:46 noodles Exp $
+ * $Id: gpgwww.c,v 1.14 2004/05/26 18:53:14 noodles Exp $

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -66,6 +66,9 @@ int main(int argc, char *argv[])
        initlogthing("gpgwww", config.logfile);
        initdb(true);
        inithash();
        initlogthing("gpgwww", config.logfile);
        initdb(true);
        inithash();

+       logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
+                       from,
+                       to);

        dofindpath(from, to, true, 3);
        destroyhash();
        cleanupdb();
        dofindpath(from, to, true, 3);
        destroyhash();
        cleanupdb();

diff --git a/lookup.c b/lookup.c
index b8242563d8b62d9b28b50631bd13cb27c785c5dc..67eac5904be420e8d4142b4bd712b80fdc0129b1 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: lookup.c,v 1.13 2004/03/23 12:33:47 noodles Exp $
+ * $Id: lookup.c,v 1.14 2004/05/26 18:53:14 noodles Exp $

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -151,6 +151,8 @@ int main(int argc, char *argv[])
                initdb(true);
                switch (op) {
                case OP_GET:
                initdb(true);
                switch (op) {
                case OP_GET:

+                       logthing(LOGTHING_NOTICE, "Getting keyid %llX",
+                                       keyid);

                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                                flatten_publickey(publickey,
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                                flatten_publickey(publickey,