[srvx-commits] CVS: services/patches log-pgsql.diff,1.2,1.3

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/patches
In directory sc8-pr-cvs1:/tmp/cvs-serv17973/patches

Modified Files:
	log-pgsql.diff 
Log Message:
remove debug statements from postgresql logging backend



Index: log-pgsql.diff
===================================================================
RCS file: /cvsroot/srvx/services/patches/log-pgsql.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** log-pgsql.diff	26 Sep 2003 22:07:56 -0000	1.2
--- log-pgsql.diff	28 Sep 2003 14:18:04 -0000	1.3
***************
*** 5,9 ****
  diff -u -r1.59 Makefile.am
  --- src/Makefile.am	9 Sep 2003 01:56:55 -0000	1.59
! +++ src/Makefile.am	26 Sep 2003 22:02:48 -0000
  @@ -9,7 +9,7 @@
   	./expnhelp < $(srcdir)/nickserv.help.m4 > $@
--- 5,9 ----
  diff -u -r1.59 Makefile.am
  --- src/Makefile.am	9 Sep 2003 01:56:55 -0000	1.59
! +++ src/Makefile.am	28 Sep 2003 14:16:39 -0000
  @@ -9,7 +9,7 @@
   	./expnhelp < $(srcdir)/nickserv.help.m4 > $@
***************
*** 21,25 ****
  diff -u -r1.65 log.c
  --- src/log.c	22 Aug 2003 00:26:21 -0000	1.65
! +++ src/log.c	26 Sep 2003 22:02:48 -0000
  @@ -22,6 +22,8 @@
   #include "log.h"
--- 21,25 ----
  diff -u -r1.65 log.c
  --- src/log.c	22 Aug 2003 00:26:21 -0000	1.65
! +++ src/log.c	28 Sep 2003 14:16:40 -0000
  @@ -22,6 +22,8 @@
   #include "log.h"
***************
*** 31,35 ****
   struct logDestination;
   
! @@ -992,6 +994,246 @@
       ldIrc_module
   };
--- 31,35 ----
   struct logDestination;
   
! @@ -992,6 +994,234 @@
       ldIrc_module
   };
***************
*** 88,96 ****
  +        PQclear(pgres);
  +    }
- +    ld->recurse_level++;
  +    if (ld->queue.used == 1)
  +        ld->queue.list[1] = NULL;
- +    log_module(MAIN_LOG, LOG_DEBUG, "pgsql_readable finished %p, next is %p", ld->queue.list[0], ld->queue.list[1]);
- +    ld->recurse_level--;
  +    free(ld->queue.list[0]);
  +    ld->queue.used--;
--- 88,93 ----
***************
*** 131,137 ****
  +ldPgsql_reopen(struct logDestination *self_) {
  +    struct logDest_pgsql *self = (struct logDest_pgsql*)self_;
- +    self->recurse_level++;
- +    log_module(MAIN_LOG, LOG_DEBUG, "pgsql_reopen finished resetting connection with %d queued (head %p)", self->queue.used, self->queue.list[0]);
- +    self->recurse_level--;
  +    PQreset(self->conn);
  +}
--- 128,131 ----
***************
*** 144,152 ****
  +    PQfinish(self->conn);
  +    ioset_close(self->fd->fd, 0);
! +    self->recurse_level++;
! +    for (ii = 0; ii < self->queue.used; ++ii) {
! +        log_module(MAIN_LOG, LOG_DEBUG, "pgsql free()'ing leftover log %p", self->queue.list[ii]);
  +        free(self->queue.list[ii]);
- +    }
  +    self->recurse_level--;
  +    free(self->queue.list);
--- 138,143 ----
  +    PQfinish(self->conn);
  +    ioset_close(self->fd->fd, 0);
! +    for (ii = 0; ii < self->queue.used; ++ii)
  +        free(self->queue.list[ii]);
  +    self->recurse_level--;
  +    free(self->queue.list);
***************
*** 195,201 ****
  +static void
  +pgsql_insert(struct logDest_pgsql *self, char *query) {
- +    self->recurse_level++;
- +    log_module(MAIN_LOG, LOG_DEBUG, "pgsql_insert(%p, %p=\"%s\")", self, query, query);
- +    self->recurse_level--;
  +    string_list_append(&self->queue, query);
  +    if (self->queue.used == 1)
--- 186,189 ----
***************
*** 278,282 ****
   log_init(void)
   {
! @@ -1003,6 +1245,7 @@
       dict_insert(log_dest_types, ldFile_vtbl.type_name, &ldFile_vtbl);
       dict_insert(log_dest_types, ldStd_vtbl.type_name, &ldStd_vtbl);
--- 266,270 ----
   log_init(void)
   {
! @@ -1003,6 +1233,7 @@
       dict_insert(log_dest_types, ldFile_vtbl.type_name, &ldFile_vtbl);
       dict_insert(log_dest_types, ldStd_vtbl.type_name, &ldStd_vtbl);