[srvx-commits] CVS: services/src log.c,1.64,1.65

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

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21031/src

Modified Files:
	log.c 
Log Message:
preserve debug status across log_reopen() calls


Index: log.c
===================================================================
RCS file: /cvsroot/srvx/services/src/log.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** log.c	31 Jul 2003 02:08:40 -0000	1.64
--- log.c	22 Aug 2003 00:26:21 -0000	1.65
***************
*** 72,76 ****
  static struct dict *log_types;
  static struct log_type *log_default;
! static int log_inited;
  
  #define MSG_INVALID_FACILITY    "$b%s$b is an invalid log facility."
--- 72,76 ----
  static struct dict *log_types;
  static struct log_type *log_default;
! static int log_inited, log_debugged;
  
  #define MSG_INVALID_FACILITY    "$b%s$b is an invalid log facility."
***************
*** 116,120 ****
      unsigned int ii;
  
!     if (!ll->size) logList_init(ll);
      switch (rd->type) {
      case RECDB_QSTRING:
--- 116,122 ----
      unsigned int ii;
  
!     if (!ll->size) {
!         logList_init(ll);
!     }
      switch (rd->type) {
      case RECDB_QSTRING:
***************
*** 374,377 ****
--- 376,382 ----
          }
      }
+     if (log_debugged) {
+         log_debug();
+     }
  }
  
***************
*** 387,395 ****
      logList_append(&target, log_stdout);
  
!     for(sev = 0; sev < LOG_NUM_SEVERITIES; ++sev) {
          logList_join(&log_default->logs[sev], &target);
      }
  
      logList_close(&target);
  }
  
--- 392,401 ----
      logList_append(&target, log_stdout);
  
!     for (sev = 0; sev < LOG_NUM_SEVERITIES; ++sev) {
          logList_join(&log_default->logs[sev], &target);
      }
  
      logList_close(&target);
+     log_debugged = 1;
  }
  
***************
*** 454,460 ****
      /* Allocate and fill in the log entry */
      size = sizeof(*entry) + strlen(user->nick) + strlen(command) + 2;
!     if (user->handle_info) size += strlen(user->handle_info->handle) + 1;
!     if (channel_name) size += strlen(channel_name) + 1;
!     if (flags & AUDIT_HOSTMASK) size += strlen(user->ident) + strlen(user->hostname) + 2;
      entry = calloc(1, size);
      str_next = (char*)(entry + 1);
--- 460,472 ----
      /* Allocate and fill in the log entry */
      size = sizeof(*entry) + strlen(user->nick) + strlen(command) + 2;
!     if (user->handle_info) {
!         size += strlen(user->handle_info->handle) + 1;
!     }
!     if (channel_name) {
!         size += strlen(channel_name) + 1;
!     }
!     if (flags & AUDIT_HOSTMASK) {
!         size += strlen(user->ident) + strlen(user->hostname) + 2;
!     }
      entry = calloc(1, size);
      str_next = (char*)(entry + 1);