[naviserver-commits] naviserver/nsd log.c,1.6,1.7 nsd.h,1.31,1.32

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31816/nsd

Modified Files:
	log.c nsd.h 
Log Message:
see ChangeLog


Index: log.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/log.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** log.c	4 Aug 2005 05:29:40 -0000	1.6
--- log.c	4 Aug 2005 22:17:41 -0000	1.7
***************
*** 203,207 ****
  Ns_InfoErrorLog(void)
  {
!     return nsconf.log.file;
  }
  
--- 203,207 ----
  Ns_InfoErrorLog(void)
  {
!     return (char*)file;
  }
  
***************
*** 227,235 ****
  Ns_LogRoll(void)
  {
!     if (nsconf.log.file != NULL) {
!         if (access(nsconf.log.file, F_OK) == 0) {
!             Ns_RollFile(nsconf.log.file, nsconf.log.maxback);
          }
!         Ns_Log(Notice, "log: re-opening log file '%s'", nsconf.log.file);
          if (LogReOpen() != NS_OK) {
              return NS_ERROR;
--- 227,235 ----
  Ns_LogRoll(void)
  {
!     if (file != NULL) {
!         if (access(file, F_OK) == 0) {
!             Ns_RollFile(file, maxback);
          }
!         Ns_Log(Notice, "log: re-opening log file '%s'", file);
          if (LogReOpen() != NS_OK) {
              return NS_ERROR;
***************
*** 416,422 ****
      if (LogReOpen() != NS_OK) {
          Ns_Fatal("log: failed to open server log '%s': '%s'",
!                  nsconf.log.file, strerror(errno));
      }
!     if (nsconf.log.flags & LOG_ROLL) {
          Ns_RegisterAtSignal((Ns_Callback *) Ns_LogRoll, NULL);
      }
--- 416,422 ----
      if (LogReOpen() != NS_OK) {
          Ns_Fatal("log: failed to open server log '%s': '%s'",
!                  file, strerror(errno));
      }
!     if (flags & LOG_ROLL) {
          Ns_RegisterAtSignal((Ns_Callback *) Ns_LogRoll, NULL);
      }
***************
*** 668,672 ****
          severityStr = logConfig[severity].string;
      } else {
!         if (severity > nsconf.log.maxlevel) {
              return 0;
          }
--- 668,672 ----
          severityStr = logConfig[severity].string;
      } else {
!         if (severity > maxlevel) {
              return 0;
          }
***************
*** 675,679 ****
      }
      Ns_DStringAppend(&cachePtr->buffer, LogTime(cachePtr, 0, &usec));
!     if (nsconf.log.flags & LOG_USEC) {
          Ns_DStringTrunc(&cachePtr->buffer, cachePtr->buffer.length-1);
          Ns_DStringPrintf(&cachePtr->buffer, ".%ld]", usec);
--- 675,679 ----
      }
      Ns_DStringAppend(&cachePtr->buffer, LogTime(cachePtr, 0, &usec));
!     if (flags & LOG_USEC) {
          Ns_DStringTrunc(&cachePtr->buffer, cachePtr->buffer.length-1);
          Ns_DStringPrintf(&cachePtr->buffer, ".%ld]", usec);
***************
*** 681,685 ****
      Ns_DStringPrintf(&cachePtr->buffer, "[%d.%lu][%s] %s: ",
                       Ns_InfoPid(), (unsigned long) Ns_ThreadId(), Ns_ThreadGetName(), severityStr);
!     if (nsconf.log.flags & LOG_EXPAND) {
          Ns_DStringAppend(&cachePtr->buffer, "\n    ");
      }
--- 681,685 ----
      Ns_DStringPrintf(&cachePtr->buffer, "[%d.%lu][%s] %s: ",
                       Ns_InfoPid(), (unsigned long) Ns_ThreadId(), Ns_ThreadGetName(), severityStr);
!     if (flags & LOG_EXPAND) {
          Ns_DStringAppend(&cachePtr->buffer, "\n    ");
      }
***************
*** 709,713 ****
  {
      Ns_DStringNAppend(&cachePtr->buffer, "\n", 1);
!     if (nsconf.log.flags & LOG_EXPAND) {
          Ns_DStringNAppend(&cachePtr->buffer, "\n", 1);
      }
--- 709,713 ----
  {
      Ns_DStringNAppend(&cachePtr->buffer, "\n", 1);
!     if (flags & LOG_EXPAND) {
          Ns_DStringNAppend(&cachePtr->buffer, "\n", 1);
      }
***************
*** 777,784 ****
  
      status = NS_OK;
!     fd = open(nsconf.log.file, O_WRONLY|O_APPEND|O_CREAT, 0644);
      if (fd < 0) {
          Ns_Log(Error, "log: failed to re-open log file '%s': '%s'",
!                nsconf.log.file, strerror(errno));
          status = NS_ERROR;
      } else {
--- 777,784 ----
  
      status = NS_OK;
!     fd = open(file, O_WRONLY|O_APPEND|O_CREAT, 0644);
      if (fd < 0) {
          Ns_Log(Error, "log: failed to re-open log file '%s': '%s'",
!                file, strerror(errno));
          status = NS_ERROR;
      } else {
***************
*** 789,793 ****
          if (fd != STDERR_FILENO && dup2(fd, STDERR_FILENO) == -1) {
              fprintf(stdout, "dup2(%s, STDERR_FILENO) failed: %s\n",
!                     nsconf.log.file, strerror(errno));
              status = NS_ERROR;
          }
--- 789,793 ----
          if (fd != STDERR_FILENO && dup2(fd, STDERR_FILENO) == -1) {
              fprintf(stdout, "dup2(%s, STDERR_FILENO) failed: %s\n",
!                     file, strerror(errno));
              status = NS_ERROR;
          }

Index: nsd.h
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsd.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** nsd.h	4 Aug 2005 05:29:40 -0000	1.31
--- nsd.h	4 Aug 2005 22:17:41 -0000	1.32
***************
*** 184,196 ****
      
      struct {
-         char *file;
-         int flags;
-         int maxlevel;
-         int maxback;
-         int maxbuffer;
-         int flushint;
-     } log;
- 
-     struct {
          int maxelapsed;
      } sched;
--- 184,187 ----