Changeset 965:9b37f34c1b1f in freeDiameter for libfdcore/fdd.y

Timestamp:

Mar 13, 2013, 1:23:37 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Some modifications to logging code:

• Added a FD_LOG_NOTICE level for the logger function
• Separated the internal debug levels (NONE, INFO, ...) from the "printlevel" for the logger
• Renamed TRACE_DEBUG_ERROR to TRACE_ERROR for symetry
• Renamed TRACE_DEBUG_BUFFER and TRACE_DEBUG_sSA. There take now the printlevel as parameter
• Added new TRACE_NOTICE, fd_log_notice and fd_log_error macros.
• sorry if I forgot some changes...

File:

• libfdcore/fdd.y (modified) (8 diffs)

libfdcore/fdd.y

@@ -63 +63 @@
 {
         if (ploc->first_line != ploc->last_line) {
-                TRACE_DEBUG_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
+                TRACE_ERROR("%s:%d.%d-%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_line, ploc->last_column, s);
         } else if (ploc->first_column != ploc->last_column) {
-                TRACE_DEBUG_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
+                TRACE_ERROR("%s:%d.%d-%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, ploc->last_column, s);
         } else {
-                TRACE_DEBUG_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
+                TRACE_ERROR("%s:%d.%d : %s\n", conf->cnf_file, ploc->first_line, ploc->first_column, s);
         }
 }
@@ -328 +328 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
+                                        TRACE_ERROR("WARNING: Unable to open extension file %s for reading: %s\nLD_LIBRARY_PATH will be used.\n", fname, strerror(ret));
                                 } else {
                                         fclose(fd);
@@ -501 +501 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open certificate file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -509 +509 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
+                                        TRACE_ERROR("Unable to open private key file %s for reading: %s\n", $5, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -532 +532 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CA file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -572 +572 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open CRL file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;
@@ -615 +615 @@
                                                         &err_pos),
                                                 { yyerror (&yylloc, conf, "Error setting Priority parameter.");
-                                                  TRACE_DEBUG_ERROR("Error at position : %s\n", err_pos);
+                                                  TRACE_ERROR("Error at position : %s\n", err_pos);
                                                   YYERROR; } );
                         }
@@ -632 +632 @@
                                 if (fd == NULL) {
                                         int ret = errno;
-                                        TRACE_DEBUG_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        TRACE_ERROR("Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
                                         yyerror (&yylloc, conf, "Error on file name"); 
                                         YYERROR;