Logger: Fixed use of unitialized flags

[libucw.git] / ucw / log-file.c

diff --git a/ucw/log-file.c b/ucw/log-file.c
index 65e9eb85df41541ccba86c0d0bf3c5d58d80f8bd..40f1f3964e487e21e7d85834f194d3b3bdd67d39 100644 (file)
--- a/ucw/log-file.c
+++ b/ucw/log-file.c
@@ -8,30 +8,27 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/log.h"
-#include "ucw/lfs.h"
-#include "ucw/threads.h"
-#include "ucw/simple-lists.h"
+#include <ucw/lib.h>
+#include <ucw/log.h>
+#include <ucw/log-internal.h>
+#include <ucw/io.h>
+#include <ucw/threads.h>
+#include <ucw/simple-lists.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <time.h>
+#include <errno.h>
 
 struct file_stream {
   struct log_stream ls;                // ls.name is the current name of the log file
   int fd;
-  uns flags;                   // FF_xxx
+  uint flags;                  // FF_xxx
   char *orig_name;             // Original name with strftime escapes
 };
 
-enum log_file_flag {
-  FF_FORMAT_NAME = 1,          // Name contains strftime escapes
-  FF_CLOSE_FD = 2,             // Close the fd with the stream
-};
-
 #define MAX_EXPAND 64          // Maximum size of expansion of strftime escapes
 
 static int log_switch_nest;
@@ -42,17 +39,15 @@ do_log_reopen(struct file_stream *fs, const char *name)
   int fd = ucw_open(name, O_WRONLY | O_CREAT | O_APPEND, 0666);
   if (fd < 0)
     die("Unable to open log file %s: %m", name);
-  if (fs->fd < 0)
-    fs->fd = fd;
-  else
-    {
-      dup2(fd, fs->fd);
-      close(fd);
-    }
+  if (fs->fd >= 0)
+    close(fs->fd);
+  fs->fd = fd;
+  if (fs->flags & FF_FD2_FOLLOWS)
+    dup2(fd, 2);
   if (fs->ls.name)
     {
       xfree(fs->ls.name);
-      fs->ls.name = NULL;      // We have to keep this consistent, die() below can invoke logging
+      fs->ls.name = NULL;      // We have to keep the stream consistent -- die() below can invoke logging
     }
   fs->ls.name = xstrdup(name);
 }
@@ -93,21 +88,6 @@ do_log_switch(struct file_stream *fs, struct tm *tm)
   return switched;
 }
 
-/* Emulate the old single-file interface: close the existing log file and open a new one. */
-void
-log_file(const char *name)
-{
-  if (!name)
-    return;
-
-  struct log_stream *ls = log_new_file(name);
-  struct log_stream *def = log_stream_by_flags(0);
-  log_rm_substream(def, NULL);
-  log_add_substream(def, ls);
-  dup2(((struct file_stream *)ls)->fd, 2);                     // Let fd2 be an alias for the log file
-}
-
-/* destructor for standard files */
 static void
 file_close(struct log_stream *ls)
 {
@@ -118,7 +98,6 @@ file_close(struct log_stream *ls)
   xfree(fs->orig_name);
 }
 
-/* handler for standard files */
 static int
 file_handler(struct log_stream *ls, struct log_msg *m)
 {
@@ -127,18 +106,16 @@ file_handler(struct log_stream *ls, struct log_msg *m)
     do_log_switch(fs, m->tm);
 
   int r = write(fs->fd, m->m, m->m_len);
-  /* FIXME: check for errors here? */
-  return 0;
+  return ((r < 0) ? errno : 0);
 }
 
-/* assign log to a file descriptor */
-/* initialize with the default formatting, does NOT close the descriptor */
 struct log_stream *
-log_new_fd(int fd)
+log_new_fd(int fd, uint flags)
 {
   struct log_stream *ls = log_new_stream(sizeof(struct file_stream));
   struct file_stream *fs = (struct file_stream *) ls;
   fs->fd = fd;
+  fs->flags = flags;
   ls->msgfmt = LSFMT_DEFAULT;
   ls->handler = file_handler;
   ls->close = file_close;
@@ -147,18 +124,16 @@ log_new_fd(int fd)
   return ls;
 }
 
-/* open() a file (append mode) */
-/* initialize with the default formatting */
 struct log_stream *
-log_new_file(const char *path)
+log_new_file(const char *path, uint flags)
 {
   struct log_stream *ls = log_new_stream(sizeof(struct file_stream));
   struct file_stream *fs = (struct file_stream *) ls;
   fs->fd = -1;
+  fs->flags = FF_CLOSE_FD | flags;
   fs->orig_name = xstrdup(path);
   if (strchr(path, '%'))
-    fs->flags = FF_FORMAT_NAME;
-  fs->flags |= FF_CLOSE_FD;
+    fs->flags |= FF_FORMAT_NAME;
   ls->msgfmt = LSFMT_DEFAULT;
   ls->handler = file_handler;
   ls->close = file_close;
@@ -197,16 +172,26 @@ log_switch_enable(void)
   log_switch_nest--;
 }
 
+void
+log_file(const char *name)
+{
+  if (!name)
+    return;
+
+  log_set_default_stream(log_new_file(name, FF_FD2_FOLLOWS));
+}
+
 #ifdef TEST
 
 int main(int argc, char **argv)
 {
   log_init(argv[0]);
   log_file("/proc/self/fd/1");
-  // struct log_stream *ls = log_new_fd(1);
-  // struct log_stream *ls = log_new_file("/tmp/quork-%Y%m%d-%H%M%S");
+  // struct log_stream *ls = log_new_fd(1, 0);
+  // struct log_stream *ls = log_new_file("/tmp/quork-%Y%m%d-%H%M%S", 0);
   for (int i=1; i<argc; i++)
     msg(L_INFO, argv[i]);
+  log_close_all();
   return 0;
 }