reorganised the log messages, fixed the typo conscerning unsetuplog in afp_options...

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index c1c093831a084dddfae3acc5e7c6991f5902007a..f8eef31513bf92d7fe5db9a9fa11dd7421590527 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -129,9 +129,7 @@
 #                         timing out a connection.  The default is 4, therefore
 #                         a connection will timeout in 2 minutes.
 #     -icon               Use the platform-specific icon.
-#
-#   OPTIONS IN DEVELOPMENT:
-#     -[un]setuplog <logtype> <loglevel> [<filename>]
+#     -[un]setuplog "<logtype> <loglevel> [<filename>]"
 #                         Specify that the given loglevel should be applied
 #                         to log messages of the given logtype and that 
 #                         these messages should be logged to the given file.
@@ -145,6 +143,13 @@
 #                         loglevels: LOG_SEVERE, LOG_ERROR, LOG_WARN, LOG_NOTE,
 #                                    LOG_INFO, LOG_DEBUG, LOG_DEBUG6, LOG_DEBUG7, 
 #                                    LOG_DEBUG8, LOG_DEBUG9, LOG_MAXDEBUG
+#
+#                         for example:
+#                    -setuplog "logger log_maxdebug /var/log/netatalk-logger.log"
+#                    -setuplog "afpdaemon log_maxdebug /var/log/netatalk-afp.log"
+#                    -unsetuplog "default level file" 
+#                    -setuplog "default log_maxdebug"
+
 #              
 # Some examples:
 #

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index aad7916d52c5aca36fdfb0921ca162e602cdf7d1..f56b7ea1ec9f1153a0a934003eced527d6433f34 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.26 2002-08-24 02:12:48 sibaz Exp $
+ * $Id: afp_options.c,v 1.27 2002-08-24 05:00:07 sibaz Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -254,7 +254,7 @@ int afp_options_parseline(char *buf, struct afp_options *options)
     {
       char *ptr, *logsource, *logtype, *loglevel, *filename;
 
-      LOG(log_extradebug, logtype_afpd, "setting up logtype, c is %s", c);
+      LOG(log_debug6, logtype_afpd, "setting up logtype, c is %s", c);
       ptr = c;
       
       /* 
@@ -307,22 +307,17 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         }
       }
 
-      /*
-      LOG(log_extradebug, logtype_afpd, "Doing setuplog %s %s %s %s", 
-          logsource, logtype, loglevel, filename);
-      */
-      LOG(log_extradebug, logtype_afpd, "Doing setuplog %s %s %s", 
+      LOG(log_debug7, logtype_afpd, "calling setuplog %s %s %s", 
           logtype, loglevel, filename);
 
-      /* setuplog(logsource, logtype, loglevel, filename); */
       setuplog(logtype, loglevel, filename);
     }
 
-    if ((c = getoption(buf, "-nosetuplog")))
+    if ((c = getoption(buf, "-unsetuplog")))
     {
       char *ptr, *logtype, *loglevel, *filename;
 
-      LOG(log_extradebug, logtype_afpd, "un setting up logtype, c is %s", c);
+      LOG(log_debug6, logtype_afpd, "unsetting up logtype, c is %s", c);
 
       ptr = c;
       logtype = ptr;
@@ -361,7 +356,7 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         }
       }
       
-      LOG(log_extradebug, logtype_afpd, "Doing setuplog %s %s %s",
+      LOG(log_debug7, logtype_afpd, "calling setuplog %s %s %s",
               logtype, NULL, filename);
 
       setuplog(logtype, NULL, filename);

diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index b3a1f14621314a6877199cfc4584c9dede41662a..146fba4c3dc6925902ecf2cc111ba4966d46e4af 100644 (file)
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -155,6 +155,20 @@ static log_file_data_pair default_log_file_data_pair = {
   display_options:  logoption_pid
 }};
 
+static log_file_data_pair logger_log_file_data_pair = {
+{
+  log_filename:    "\0\0\0\0\0\0\0\0",
+  log_file:        NULL,
+  log_level:       log_warning,
+  display_options: logoption_pid
+},
+{
+  log_filename:     LOGFILEPATH,
+  log_file:         NULL,
+  log_level:        log_maxdebug,
+  display_options:  logoption_pid
+}};
+
 static log_file_data_pair *log_file_data_array[logtype_end_of_list_marker] = 
 {&default_log_file_data_pair};
 
@@ -204,10 +218,13 @@ void log_init()
     /* next clear out the log_file_data_array */
     memset(log_file_data_array, 0, sizeof(log_file_data_array));
     /* now set default_log_file_data_pairs */
-    log_file_data_array[0] = &default_log_file_data_pair;
+    log_file_data_array[logtype_default] = &default_log_file_data_pair;
+    log_file_data_array[logtype_logger]  = &logger_log_file_data_pair;
 
     /* now setup the global_log_data struct */
     global_log_data.logs = log_file_data_array;
+
+    /* make_log_entry(log_debug, logtype_logger, "log_init ran for the first time"); */
   }
 }
 #endif /* #ifndef DISABLE_LOGGER */
@@ -231,7 +248,7 @@ bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype,
 
   logs = log_file_arr[logtype];
   
-  LOG(log_debug6, logtype_logger, "doing log_setup, type %d, level %d, filename \"%s\"", logtype, loglevel, filename);
+  LOG(log_info, logtype_logger, "doing log_setup, type %d, level %d, filename \"%s\"", logtype, loglevel, filename);
 
   /* LOG(log_extradebug+10, logtype_logger, "checking array for logtype is malloc'd"); */
   /* has the given logtype already been assigned memory? */
@@ -372,7 +389,7 @@ bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype,
   LOG(log_debug7, logtype_logger, "log_file_arr[%d] now contains: "
                                  "{log_filename:%s, log_file:%p, log_level: %d}", logtype,
                                   (*logs)[1].log_filename, (*logs)[1].log_file, (*logs)[1].log_level);
-  LOG(log_info, logtype_logger, "Log setup complete");
+  LOG(log_debug, logtype_logger, "log_setup[%d] done", logtype);
 
 #endif /* DISABLE_LOGGER */
   return true;
@@ -389,6 +406,8 @@ void syslog_setup(enum loglevels loglevel, enum logtypes logtype,
 
   logs = log_file_arr[logtype];
 
+  LOG(log_info, logtype_logger, "doing syslog_setup, type %d, level %d", logtype, loglevel);
+
   if (logs==NULL)
   {
     logs = (log_file_data_pair *)malloc(sizeof(log_file_data_pair));    
@@ -412,7 +431,10 @@ void syslog_setup(enum loglevels loglevel, enum logtypes logtype,
   openlog(global_log_data.processname, (*logs)[0].display_options, 
          global_log_data.facility);
 
-  LOG(log_info, logtype_logger, "SysLog setup complete");
+  LOG(log_debug7, logtype_logger, "log_file_arr[%d] now contains: "
+                                  "{log_filename:%s, log_file:%p, log_level: %d}", logtype,
+                                  (*logs)[0].log_filename, (*logs)[0].log_file, (*logs)[0].log_level);
+  LOG(log_debug, logtype_logger, "syslog_setup[%d] done", logtype);
 #else /* DISABLE_LOGGER */
 /* behave like a normal openlog call */
   openlog(disabled_logger_processname, display_options, facility);
@@ -425,7 +447,7 @@ void log_close()
   log_file_data_pair *logs;
   int n;
 
-  LOG(log_info, logtype_logger, "Closing logs");
+  LOG(log_info, logtype_logger, "log_close called");
 
   for(n=(sizeof(log_file_arr)-1);n>0;n--)
   {
@@ -436,6 +458,7 @@ void log_close()
 #endif /* KEEP_LOGFILES_OPEN */
     if (logs!=NULL)
     {
+      LOG(log_debug, logtype_logger, "freeing log entry at %d", n);
 #ifdef DEBUG_OUTPUT_TO_SCREEN
       printf("Freeing log_data %d, stored at %p\n", n, logs);
       printf("\t(filename) %s\t(type) %s\n", (*logs)[1].log_filename, 
@@ -454,6 +477,8 @@ void log_close()
 #endif /* DEBUG_OUTPUT_TO_SCREEN */
 #endif /* DISABLE_LOGGER */
 
+  LOG(log_debug, logtype_logger, "log_close done");
+
   closelog();
 }
 
@@ -898,12 +923,12 @@ void setuplog(char *logtype, char *loglevel, char *filename)
   LOG(log_extradebug, logtype_logger, "Attempting setuplog: %s %s %s %s", 
       logsource, logtype, loglevel, filename);
   */
-  LOG(log_debug6, logtype_logger, "Attempting setuplog: %s %s %s", 
+  LOG(log_info, logtype_logger, "setuplog is parsing logtype:%s, loglevel:%s, filename:%s", 
       logtype, loglevel, filename);
 
   if (logtype==NULL)
   {
-    LOG(log_note, logtype_logger, "no logsource given");
+    LOG(log_note, logtype_logger, "no logsource given, default is assumed");
     typenum=0;
   }
   else
@@ -921,7 +946,7 @@ void setuplog(char *logtype, char *loglevel, char *filename)
 
   if (loglevel==NULL)
   {
-    LOG(log_note, logtype_logger, "no loglevel given");
+    LOG(log_note, logtype_logger, "no loglevel given, severe is assumed");
     levelnum=0;
   }
   else
@@ -951,14 +976,14 @@ void setuplog(char *logtype, char *loglevel, char *filename)
   /* is this a syslog setup or a filelog setup */
   if (filename==NULL) /* must be syslog */
   {
-    LOG(log_note, logtype_logger, "Doing syslog_setup(%d, %d, ...)", levelnum, typenum);
+    LOG(log_debug6, logtype_logger, "calling syslog_setup(%d, %d, ...)", levelnum, typenum);
     syslog_setup(levelnum, typenum, 
                 (*logs)[0].display_options,
                 global_log_data.facility);
   }
   else /* this must be a filelog */
   {
-    LOG(log_note, logtype_logger, "Doing log_setup(%s, %d, %d, ...)", filename, levelnum, typenum);
+    LOG(log_debug6, logtype_logger, "calling log_setup(%s, %d, %d, ...)", filename, levelnum, typenum);
     log_setup(filename, levelnum, typenum, 
              (*logs)[0].display_options);
   };