X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=res%2Blog%2Fgw-log.c;h=a7e6558e0f7d820d537b93bcf5851db6acd2fd96;hb=e34e380795cac32a6a1d4ed126560c90a68301b3;hp=bfeccf4cd0a5eed60eb99ac3fbde75b953578b52;hpb=5bc115d3b598f5ad198411dcd033a91a8356c9be;p=egate.git

diff --git a/res+log/gw-log.c b/res+log/gw-log.c
index bfeccf4..a7e6558 100644
--- a/res+log/gw-log.c
+++ b/res+log/gw-log.c
@@ -1,16 +1,34 @@
 /*
-   gw-log.c: Implementation of logging facilities.
-
-   Europagate, 1994-1995.
-
-   $Log: gw-log.c,v $
-   Revision 1.1  1995/02/09 17:27:11  adam
-   Initial revision
-
-
-   Initial:       Dec  7, 94 (Adam Dickmeiss)
-   Last update:   Dec 13, 94 (Adam Dickmeiss)
-
+ * Implementation of logging facilities.
+ *
+ * Europagate, 1994-1995.
+ *
+ * $Log: gw-log.c,v $
+ * Revision 1.9  1995/04/19 12:12:06  adam
+ * Resource system uses only one log debug level.
+ *
+ * Revision 1.8  1995/04/17  09:36:16  adam
+ * Minor changes.
+ *
+ * Revision 1.7  1995/04/10  13:20:25  adam
+ * Use gettimeofday(2) instead of time(2) to get log time in milliseconds.
+ *
+ * Revision 1.6  1995/03/28  08:01:51  adam
+ * Bug fix: GW_LOG_ERRNO.
+ *
+ * Revision 1.5  1995/03/27  12:51:10  adam
+ * New log level in use: GW_LOG_ERRNO.
+ *
+ * Revision 1.4  1995/02/23  08:32:22  adam
+ * Changed header.
+ *
+ * Revision 1.2  1995/02/17  17:06:56  adam
+ * Remove everything before '/' in app_name. Use compact date format.
+ *
+ * Revision 1.1.1.1  1995/02/09  17:27:12  adam
+ * Initial version of email gateway under CVS control.
+ *
+ * Initial:       Dec  7, 94 (Adam Dickmeiss)
  */
 
 #include <stdio.h>
@@ -18,8 +36,10 @@
 #include <string.h>
 #include <stdarg.h>
 #include <fcntl.h>
+#include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
+#include <errno.h>
 
 #include <gw-log.h>
 
@@ -47,8 +67,12 @@ char *gw_strdup (const char *s)
 void gw_log_init (const char *app_name_a)
 {
     struct file_mask *list, *list1;
+    const char *cp;
 
-    app_name = gw_strdup (app_name_a);
+    if ((cp = strrchr (app_name_a, '/')))
+        app_name = gw_strdup (cp+1);
+    else
+        app_name = gw_strdup (app_name_a);
     level = GW_LOG_DEFAULT;
     session = 0;
 
@@ -117,24 +141,37 @@ int gw_log (unsigned level_a, const char *event_type, const char *format, ...)
 {
     static char emit_str[2048];
     struct file_mask *list;
+    struct timeval tv;
+    struct timezone tz;
     va_list ap;
     unsigned e_level = level_a & level;
     int count;
     int err = 0;
-    time_t time_now;
+    struct tm tms;
     char *cp;
 
     if (!e_level)                          /* any effective level(s)? */      
         return 0;
 
     va_start (ap, format);
-    time (&time_now);
-    sprintf (emit_str, "%s %d %s %d %s ", app_name, session,
-             ctime (&time_now), e_level, event_type);
+    gettimeofday (&tv, &tz);
+
+    memcpy (&tms, localtime (&tv.tv_sec), sizeof(tms));
+    sprintf (emit_str, "%s %d %02d%02d%02d%02d%02d%02d%03d %d %s ",
+             app_name, session,
+             tms.tm_year, 1+tms.tm_mon, tms.tm_mday,
+             tms.tm_hour, tms.tm_min, tms.tm_sec,
+             (int) (tv.tv_usec/1000),
+             e_level, event_type);
     if ((cp = strchr (emit_str, '\n')))    /* remove \n from ctime-str */
         *cp = ' ';
     count = strlen (emit_str);
     vsprintf (emit_str+count, format, ap);
+    if (level_a & GW_LOG_ERRNO)
+    {
+        strcat (emit_str, ": ");
+        strcat (emit_str, strerror (errno));
+    }
     strcat (emit_str, "\n");
     count = strlen (emit_str);