altered the format that setuplog works so one less parameter is needed. This unteste...

[netatalk.git] / include / atalk / logger.h

diff --git a/include/atalk/logger.h b/include/atalk/logger.h
index ddc49ddc6b34367c9fbdd4e38e292fea26bea662..61f5125ba93eabcf8ecc08c81eec80932e26f0cb 100644 (file)
--- a/include/atalk/logger.h
+++ b/include/atalk/logger.h
@@ -16,8 +16,17 @@ enum loglevels {
   log_warning  = 20,
   log_note     = 30,
   log_info     = 40,
-  log_debug    = 50
+  log_debug    = 50,
+  log_extradebug= 60
 };
+#define LOGLEVEL_STRING_IDENTIFIERS { \
+  "LOG_SEVERE",                       \
+  "LOG_ERROR",                        \
+  "LOG_WARN",                         \
+  "LOG_NOTE",                         \
+  "LOG_INFO",                         \
+  "LOG_DEBUG",                        \
+  "LOG_EXTRADEBUG"}                        
 
 /* this is the enum specifying all availiable logtypes */
 enum logtypes {
@@ -25,6 +34,7 @@ enum logtypes {
   logtype_core,
   logtype_logger,
   logtype_cnid,
+  logtype_afpd,
 
   logtype_end_of_list_marker  /* don't put any logtypes after this */
 };
@@ -35,18 +45,19 @@ enum logtypes {
   "Core",                            \
   "Logger",                          \
   "CNID",                            \
+  "AFPDaemon",                       \
                                      \
   "end_of_list_marker"}              \
 
 /* Display Option flags. */
 /* redefine these so they can don't interfeer with syslog */
 /* these can be used in standard logging too */
-#define logoption_pid         0x01    /* log the pid with each message */
-#define logoption_cons        0x02    /* log on the console if errors in sending */
-#define logoption_ndelay      0x08    /* don't delay open */
-#define logoption_perror      0x20    /* log to stderr as well */
-#define logoption_nfile       0x40    /* don't log the file name that called the log */
-#define logoption_nline       0x80    /* don't log the line number from where the log was called */
+#define logoption_pid         0x01   /* log the pid with each message */
+#define logoption_cons        0x02   /* log on the console if error logging */
+#define logoption_ndelay      0x08   /* don't delay open */
+#define logoption_perror      0x20   /* log to stderr as well */
+#define logoption_nfile       0x40   /* ignore the file that called the log */
+#define logoption_nline       0x80   /* ignore the line that called the log*/
 
 /* facility codes */
 /* redefine these so they can don't interfeer with syslog */
@@ -54,19 +65,24 @@ enum logtypes {
 #define logfacility_mail        (2<<3)  /* mail system */
 #define logfacility_daemon      (3<<3)  /* system daemons */
 #define logfacility_auth        (4<<3)  /* security/authorization messages */
-#define logfacility_syslog      (5<<3)  /* messages generated internally by syslogd */
+#define logfacility_syslog      (5<<3)  /* messages generated by syslogd */
 #define logfacility_lpr         (6<<3)  /* line printer subsystem */
-#define logfacility_authpriv    (10<<3) /* security/authorization messages (private) */
+#define logfacility_authpriv    (10<<3) /* security/auth messages (private) */
 #define logfacility_ftp         (11<<3) /* ftp daemon */
 
 /* Setup the log filename and the loglevel, and the type of log it is. */
 /* setup the internal variables used by the logger (called automatically) */
 void log_init();
 
-bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype, int display_options);
+bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype, 
+              int display_options);
 
 /* Setup the Level and type of log that will be logged to syslog. */
-void syslog_setup(enum loglevels loglevel, enum logtypes logtype, int display_options, int facility);
+void syslog_setup(enum loglevels loglevel, enum logtypes logtype, 
+                 int display_options, int facility);
+
+/* void setuplog(char *logsource, char *logtype, char *loglevel, char *filename); */
+void setuplog(char *logtype, char *loglevel, char *filename);
 
 /* finish up and close the logs */
 void log_close();