[naviserver-commits] naviserver/nslog nslog.c,1.11,1.12

[Stephen D. <sd...@us...>]

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

Modified Files:
	nslog.c 
Log Message:
        * nslog/nslog.c:
        * nscp/nscp.c:
        * nscgi/nscgi.c:
        * nsdb/dbinit.c: Use new config routines.


Index: nslog.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nslog/nslog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** nslog.c	5 Oct 2005 09:40:33 -0000	1.11
--- nslog.c	17 Oct 2005 11:25:17 -0000	1.12
***************
*** 167,173 ****
  Ns_ModuleInit(char *server, char *module)
  {
!     char       *path;
      Log        *logPtr;
!     int         opt, hour, status;
      Ns_DString  ds;
      static int  first = 1;
--- 167,173 ----
  Ns_ModuleInit(char *server, char *module)
  {
!     CONST char *path, *file;
      Log        *logPtr;
!     int         hour, status;
      Ns_DString  ds;
      static int  first = 1;
***************
*** 192,213 ****
      Ns_DStringInit(&logPtr->buffer);
  
      /*
       * Determine the name of the log file
       */
  
!     path = Ns_ConfigGetPath(server, module, NULL);
!     logPtr->file = Ns_ConfigGetValue(path, "file");
!     if (logPtr->file == NULL) {
!         logPtr->file = "access.log";
!     }
!     logPtr->file = ns_strdup(logPtr->file);
!     
!     /*
!      * If log file is not given in absolute format, it's expected to 
!      * exist in the module specific directory. The module directory
!      * is created if necessary.
!      */
  
-     if (Ns_PathIsAbsolute(logPtr->file) == NS_FALSE) {
          Tcl_Obj *dirpath;
          Ns_ModulePath(&ds, server, module, NULL, NULL);
--- 192,211 ----
      Ns_DStringInit(&logPtr->buffer);
  
+     path = Ns_ConfigGetPath(server, module, NULL);
+ 
      /*
       * Determine the name of the log file
       */
  
!     file = Ns_ConfigString(path, "file", "access.log");
!     if (Ns_PathIsAbsolute(file)) {
!         logPtr->file = ns_strdup(file);
!     } else {
! 
!         /*
!          * If log file is not given in absolute format, it's expected to 
!          * exist in the module specific directory, which is created if necessary.
!          */
  
          Tcl_Obj *dirpath;
          Ns_ModulePath(&ds, server, module, NULL, NULL);
***************
*** 231,258 ****
       */
  
!     logPtr->rollfmt = Ns_ConfigGetValue(path, "rollfmt");
!     if (logPtr->rollfmt != NULL) {
!         logPtr->rollfmt = ns_strdup(logPtr->rollfmt);
!     }
!     if (!Ns_ConfigGetInt(path, "maxbackup", &logPtr->maxbackup)
!         || logPtr->maxbackup < 1) {
!         logPtr->maxbackup = 100;
!     }
!     if (!Ns_ConfigGetInt(path, "maxbuffer", &logPtr->maxlines))  {
!         logPtr->maxlines = 0;
!     }
!     if (!Ns_ConfigGetBool(path, "formattedTime", &opt) || opt)  {
          logPtr->flags |= LOG_FMTTIME;
      }
!     if (!Ns_ConfigGetBool(path, "logcombined", &opt) || opt) {
          logPtr->flags |= LOG_COMBINED;
      }
!     if (Ns_ConfigGetBool(path, "logreqtime", &opt) && opt) {
          logPtr->flags |= LOG_REQTIME;
      }
!     if (Ns_ConfigGetBool(path, "suppressquery", &opt) && opt) {
          logPtr->flags |= LOG_SUPPRESSQUERY;
      }
!     if (Ns_ConfigGetBool(path, "checkforproxy", &opt) && opt) {
          logPtr->flags |= LOG_CHECKFORPROXY;
      }
--- 229,248 ----
       */
  
!     logPtr->rollfmt = ns_strcopy(Ns_ConfigGetValue(path, "rollfmt"));
!     logPtr->maxbackup = Ns_ConfigIntRange(path, "maxbackup", 100, 1, INT_MAX);
!     logPtr->maxlines = Ns_ConfigIntRange(path, "maxbuffer", 0, 0, INT_MAX);
!     if (Ns_ConfigBool(path, "formattedtime", NS_TRUE)) {
          logPtr->flags |= LOG_FMTTIME;
      }
!     if (Ns_ConfigBool(path, "logcombined", NS_TRUE)) {
          logPtr->flags |= LOG_COMBINED;
      }
!     if (Ns_ConfigBool(path, "logreqtime", NS_FALSE)) {
          logPtr->flags |= LOG_REQTIME;
      }
!     if (Ns_ConfigBool(path, "suppressquery", NS_FALSE)) {
          logPtr->flags |= LOG_SUPPRESSQUERY;
      }
!     if (Ns_ConfigBool(path, "checkforproxy", NS_FALSE)) {
          logPtr->flags |= LOG_CHECKFORPROXY;
      }
***************
*** 262,273 ****
       */
  
!     if (!Ns_ConfigGetInt(path, "rollhour", &hour) || hour < 0 || hour > 23) {
!         hour = 0;
!     }
!     if (!Ns_ConfigGetBool(path, "rolllog", &opt) || opt) {
          Ns_ScheduleDaily((Ns_SchedProc *) LogRollCallback, logPtr, 
                           0, hour, 0, NULL);
      }
!     if (Ns_ConfigGetBool(path, "rollonsignal", &opt) && opt) {
          Ns_RegisterAtSignal(LogRollCallback, logPtr);
      }
--- 252,261 ----
       */
  
!     if (Ns_ConfigBool(path, "rolllog", NS_TRUE)) {
!         hour = Ns_ConfigIntRange(path, "rollhour", 0, 0, 23);
          Ns_ScheduleDaily((Ns_SchedProc *) LogRollCallback, logPtr, 
                           0, hour, 0, NULL);
      }
!     if (Ns_ConfigBool(path, "rollonsignal", NS_FALSE)) {
          Ns_RegisterAtSignal(LogRollCallback, logPtr);
      }