Changeset 1779

Timestamp:

2000-12-11T12:03:48+13:00 (23 years ago)

Author:

sjboddie

Message:

Implemented LogDateFormat configuration option.

Location:

trunk/gsdl

Files:

• etc/main.cfg (modified) (4 diffs)
• lib/gsdltimes.cpp (modified) (3 diffs)
• src/recpt/receptionist.cpp (modified) (5 diffs)
• src/recpt/receptionist.h (modified) (2 diffs)

trunk/gsdl/etc/main.cfg

@@ -14 +14 @@
 # turning off EmailEvents and EmailUserEvents will remove any 
 # reliance on MailServer.
-#MailServer mail.cs.waikato.ac.nz
+#MailServer      mail.cs.waikato.ac.nz
 
 # Set status to "disabled" if you don't want the Maintenance and
@@ -33 +33 @@
 usecookies      false
 
+# LogDateFormat sets the format that timestamps will be stored in the usage
+# log (i.e. if logcgiargs is enabled). It takes the following values:
+LocalTime: (the default) The local time and date in the form 
+           "Thu Dec  7 23:47:00 NZDT 2000".
+UTCTime: Coordinated universal time (GMT) in the same format as LocalTime.
+Absolute: Integer value representing the number of seconds since 
+          00:00:00 1/1/1970 GMT
+LogDateFormat   LocalTime
+
 # Log any events that Greenstone deems important in 
 # $GSDLHOME/etc/events.txt. 
@@ -42 +51 @@
 #                  (e.g. someone just built a collection)
 # Disabled: Don't log events
-LogEvents       AllEvents
+LogEvents       Disabled
 
 # Email the maintainer whenever any event occurs. EmailEvents
@@ -48 +57 @@
 # Note that perl must be installed for EmailEvents or
 # EmailUserEvents to work.
-EmailEvents     AllEvents
+EmailEvents     Disabled
 
 # In some cases it may be appropriate to email the user about a
 # certain event (e.g. notification from the collector that a collection
 # was built successfully)
-EmailUserEvents true
+EmailUserEvents false
 
 

trunk/gsdl/lib/gsdltimes.cpp

@@ -117 +117 @@
 }
 
-// returns current date and time formatted like "Thu Dec 7 23:43:38 2000"
+// returns current date and time formatted like "Thu Dec 7 23:43:38 GMT 2000"
 // if ltime is true return value will be expressed in local time, otherwise
 // it'll be Coordinated Universal Time (UTC)
@@ -123 +123 @@
 text_t get_date (bool ltime) {
 
-  char *timestr;
+  char *timestr = new char[128];
   tm *tm_ptr = NULL;
   time_t t = time(NULL);
@@ -130 +130 @@
   if (tm_ptr == NULL) return "";
 
-  strftime (timestr, 128, "%a %b %e %T %Y", tm_ptr);
+  strftime (timestr, 128, "%a %b %e %T %Z %Y", tm_ptr);
   text_t ret = timestr;
+  delete timestr;
   return ret;
 }

trunk/gsdl/src/recpt/receptionist.cpp

@@ -29 +29 @@
 #include "htmlutils.h"
 #include "gsdltools.h"
+#include "gsdltimes.h"
 #include "OIDtools.h"
 #include <assert.h>
@@ -56 +57 @@
   usecookies = false;
   logcgiargs = false;
+  LogDateFormat = LocalTime;
 
   maintainer.clear();
@@ -214 +216 @@
     else if (key == "maintainer") configinfo.maintainer = cfgline[0];
     else if (key == "MailServer") configinfo.MailServer = cfgline[0];
+    else if (key == "LogDateFormat") {
+      if (cfgline[0] == "UTCTime") configinfo.LogDateFormat = UTCTime;
+      else if (cfgline[0] == "Absolute") configinfo.LogDateFormat = Absolute;
+    } 
     else if (key == "LogEvents") {
       if (cfgline[0] == "CollectorEvents") configinfo.LogEvents = CollectorEvents;
@@ -595 +601 @@
   if (host.empty()) host = gsdl_getenv ("REMOTE_ADDR", fcgienv);
   text_t browser = gsdl_getenv ("HTTP_USER_AGENT", fcgienv);
-  time_t ttime = time(NULL);
 
   cgiargsclass::const_iterator args_here = args.begin();
@@ -615 +620 @@
   logstr += " " + host;
   logstr += " [";
-  logstr += ttime;
+  if (configinfo.LogDateFormat == UTCTime) {
+    logstr += get_date (false);
+  } else if (configinfo.LogDateFormat == Absolute) {
+    time_t ttime = time(NULL);
+    logstr += ttime;
+  } else {
+    // LocalTime
+    logstr += get_date (true);
+  }
   logstr += "] (" + argstr + ") \"";
   logstr += browser;

trunk/gsdl/src/recpt/receptionist.h

@@ -63 +63 @@
 
 enum events_t {Disabled, CollectorEvents, AllEvents};
+enum ldformat_t {LocalTime, UTCTime, Absolute};
 
 struct recptconf {
@@ -78 +79 @@
   bool logcgiargs;  // true if we want to log cgi arguments
 
+  ldformat_t LogDateFormat;
+
   text_t maintainer; // email address of maintainer
   text_t MailServer; // SMTP mail server to use when sending event messages by email