Changeset 595

Timestamp:

1999-09-17T09:38:17+12:00 (25 years ago)

Author:

sjboddie

Message:

added some file locking stuff for logging. Windows still needs to
be done.

Location:

trunk/gsdl

Files:

• lib/gsdlconf.h (modified) (1 diff)
• src/recpt/receptionist.cpp (modified) (7 diffs)
• src/recpt/receptionist.h (modified) (1 diff)

trunk/gsdl/lib/gsdlconf.h

@@ -77 +77 @@
 
 
+// file locking
+
+#if defined(__WIN32__)
+#define MY_UNLOCK    0
+#define MY_READLOCK  1
+#define MY_WRITELOCK 2
+int my_locking(int fd, int lmode, long lockoffset, long nbytes);
+
+#define UNLOCK_FILE(fd)    my_locking(fd, MY_UNLOCK, 0, 10)
+#define READLOCK_FILE(fd)  lock_val = my_locking(fd, MY_READLOCK, 0, 10)
+#define WRITELOCK_FILE(fd) lock_val = my_locking(fd, MY_WRITELOCK, 0, 10)
+
+#else
+
+#if GSDL_USE_FLOCK
+#include <sys/lock.h>
+
+#ifndef LOCK_SH
+#define LOCK_SH 1
 #endif
+
+#ifndef LOCK_EX
+#define LOCK_EX 2
+#endif
+
+#ifndef LOCK_NB
+#define LOCK_NB 4
+#endif
+
+#ifndef LOCK_UN
+#define LOCK_UN 8
+#endif
+
+#define UNLOCK_FILE(fd) flock (fd, LOCK_UN)
+#define READLOCK_FILE(fd) lock_val = flock (fd, LOCK_SH + LOCK_NB)
+#define WRITELOCK_FILE(fd) lock_val = flock (fd, LOCK_EX + LOCK_NB)
+
+#else
+// use fcntl
+#include <fcntl.h>
+#define UNLOCK_FILE(fd) \
+    {                   \
+      struct flock flock;           \
+      flock.l_type = F_UNLCK;       \
+      flock.l_whence = SEEK_SET;        \
+      flock.l_start = flock.l_len = 0L; \
+      fcntl (fd, F_SETLK, &flock);  \
+    }
+#define READLOCK_FILE(fd) \
+    {                   \
+      struct flock flock;           \
+      flock.l_type = F_RDLCK;       \
+      flock.l_whence = SEEK_SET;            \
+      flock.l_start = flock.l_len = 0L; \
+      lock_val = fcntl (fd, F_SETLK, &flock);   \
+    }
+#define WRITELOCK_FILE(fd) \
+    {                   \
+      struct flock flock;           \
+      flock.l_type = F_WRLCK;       \
+      flock.l_whence = SEEK_SET;            \
+      flock.l_start = flock.l_len = 0L; \
+      lock_val = fcntl (fd, F_SETLK, &flock);   \
+    }
+
+#endif
+#endif
+
+#endif

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.31  1999/09/16 21:38:17  sjboddie
+   added some file locking stuff for logging. Windows still needs to
+   be done.
+
    Revision 1.30  1999/09/07 04:56:58  sjboddie
    added GPL notice
@@ -172 +176 @@
 #include <assert.h>
 #include <time.h>
+#include <stdio.h>
 #include <fstream.h>
 
@@ -464 +469 @@
     converthere++;
   }
-
+  
   // set default converter if no good one has been defined
   if (!defaultconvertname.empty()) {
     cgiarginfo *ainfo = argsinfo.getarginfo ("w");
-    if ((ainfo != NULL) && (converters.get_outconverter(ainfo->argdefault) == NULL)) {
-      ainfo->defaultstatus = cgiarginfo::good;
-      ainfo->argdefault = defaultconvertname;
-    }
-  }
-  
+    if (ainfo->argdefault != "w") {
+      if ((ainfo != NULL) && (converters.get_outconverter(ainfo->argdefault) == NULL)) {
+    ainfo->defaultstatus = cgiarginfo::good;
+    ainfo->argdefault = defaultconvertname;
+      }
+    }
+  }
+
   // init the actions
   actionptrmap::iterator actionhere = actions.begin ();
@@ -617 +624 @@
 bool receptionist::log_cgi_args (cgiargsclass &args, ostream &logout) {
 
-  utf8outconvertclass text_t2utf8;
-
   // see if we want to log the cgi arguments
   if (!configinfo.logcgiargs) return true;
@@ -625 +630 @@
   host = getenv("REMOTE_HOST");
   if (host == NULL) host = getenv ("REMOTE_ADDR");
+  if (host == NULL) host = "";
   char *browser = getenv("HTTP_USER_AGENT");
+  if (browser == NULL) browser = "";
   time_t ttime = time(NULL);
 
@@ -642 +649 @@
   text_t logfile = filename_cat (configinfo.gsdlhome, "etc");
   logfile = filename_cat (logfile, "usage.txt");
-  char *lfile = logfile.getcstr();
-  
+
+  text_t logstr = host;
+  logstr += " [";
+  logstr += ttime;
+  logstr += "] (" + argstr + ") \"";
+  logstr += browser;
+  logstr += "\"\n";
+
+  return append_logstr (logfile, logstr, logout);
+}
+
+bool receptionist::append_logstr (const text_t &filename, const text_t &logstr,
+                  ostream &logout) {
+
+  utf8outconvertclass text_t2utf8;
+  char *lfile = filename.getcstr();
   ofstream log (lfile, ios::app);
   
@@ -650 +671 @@
     delete lfile;
     return false;
-  } 
-
-  log << text_t2utf8 << host << " [" << ttime 
-      << "] (" << argstr << ") \"" << browser << "\"\n";
-    
+  }
+
+  int fd = log.filedesc();
+  // lock_val is set to 0 if file is locked successfully
+  int lock_val = 1;
+  WRITELOCK_FILE (fd);
+  if (lock_val == 0) {
+    log << text_t2utf8 << logstr;
+    UNLOCK_FILE (fd);
+  } else 
+    logout << "Error: Couldn't lock file " << lfile << "\n";
+
   log.close();
         

trunk/gsdl/src/recpt/receptionist.h

@@ -92 +92 @@
   virtual void define_general_macros (cgiargsclass &args, recptproto *collectproto,
                       outconvertclass &outconvert, ostream &logout);
+
+  bool append_logstr (const text_t &filename, const text_t &logstr,
+              ostream &logout);
 
 public: