Reworked logger

[netatalk.git] / libatalk / util / test / logger_test.c

diff --git a/libatalk/util/test/logger_test.c b/libatalk/util/test/logger_test.c
index f9734d1dc85c35ae32eec8931bda22bba8be203d..7ab062e00d88cda99d9a67f158d523419383cfd5 100644 (file)
--- a/libatalk/util/test/logger_test.c
+++ b/libatalk/util/test/logger_test.c
@@ -1,6 +1,4 @@
-
 #include <stdio.h>
-#include <atalk/logger.h>
 
 #include <atalk/boolean.h>
 #include <atalk/logger.h>
@@ -9,31 +7,35 @@ int main(int argc, char *argv[])
 {
   bool retval;
 
-  /* LoadProccessNameFromProc(); */
   set_processname("logger_Test");
-  log_init();
-
-  LOG(log_severe, logtype_logger, "Logging Test starting");
-  printf("Logging Test Starting\n");
-
-  LOG(log_debug, logtype_default, logtype_logger, "Testing 123");
-  LOG(log_error, logtype_logger, "Testing 456");
-
-  retval = log_setup("/var/log/newlog.log", log_error, logtype_default, logoption_pid);
-  retval = log_setup(NULL, log_error, logtype_logger, logoption_pid);
-
-  LOG(log_debug, logtype_default, logtype_logger, "This shouldn't log");
-  LOG(log_error, logtype_logger, "This should log");
-
-  syslog_setup(log_error, logtype_default, logoption_pid, logfacility_user);
 
-  LOG(log_debug, logtype_default, logtype_logger, "This shouldn't log");
-  LOG(log_error, logtype_logger, "This should log");
+  LOG(log_severe, logtype_logger, "Logging Test starting: this should only log to syslog");
+
+  /* syslog testing */
+  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
+  setuplog("Default",  NULL, NULL);
+  LOG(log_error, logtype_default, "This shouldn't log to syslog: LOG(log_error, logtype_default).");
+  LOG(log_error, logtype_logger, "This shouldn't log to syslog: LOG(log_error, logtype_logger).");
+  setuplog("Default",  "LOG_INFO", NULL);
+  LOG(log_info, logtype_logger, "Set syslog logging to 'log_info', so this should log again. LOG(log_info, logtype_logger).");
+  LOG(log_error, logtype_logger, "This should log to syslog: LOG(log_error, logtype_logger).");
+  LOG(log_error, logtype_default, "This should log to syslog. LOG(log_error, logtype_default).");
+  LOG(log_debug, logtype_logger, "This shouldn't log to syslog. LOG(log_debug, logtype_logger).");
+  LOG(log_debug, logtype_default, "This shouldn't log to syslog. LOG(log_debug, logtype_default).");
+  LOG(log_severe, logtype_logger, "Disabling syslog logging.");
+  setuplog("Default",  NULL, NULL);
+
+  /* filelog testing */
+  setuplog("Default",  "LOG_INFO", "test.log");
+  LOG(log_info, logtype_logger, "This should log.");
+  LOG(log_info, logtype_default, "This should log.");
+  LOG(log_error, logtype_logger, "This should log.");
+  LOG(log_error, logtype_default, "This should log.");
+  LOG(log_debug, logtype_logger, "This should not log.");
+  LOG(log_debug, logtype_default, "This should not log.");
 
-  printf("Logging Test finishing\n");
   LOG(log_severe, logtype_logger, "Logging Test finishing");
 
-  log_close();
   return 0;
 }