Changeset 1387:d70f5f6cb306 in freeDiameter for extensions/rt_ereg/rtereg_conf.y

Timestamp:

Oct 15, 2019, 11:25:47 PM (5 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

rt_ereg: improve logging and locking

File:

• extensions/rt_ereg/rtereg_conf.y (modified) (11 diffs)

extensions/rt_ereg/rtereg_conf.y

@@ -62 +62 @@
         int ret;
 
-        TRACE_ENTRY("%p", conffile);
-
-        TRACE_DEBUG (FULL, "Parsing configuration file: %s...", conffile);
+        LOG_D("[rt_ereg] parsing configuration file '%s'", conffile);
 
         rtereg_confin = fopen(conffile, "r");
@@ -70 +68 @@
                 ret = errno;
                 fd_log_debug("Unable to open extension configuration file %s for reading: %s", conffile, strerror(ret));
-                TRACE_DEBUG (INFO, "rt_ereg: error occurred, message logged -- configuration file.");
+                LOG_E("[rt_ereg] error occurred, message logged -- configuration file.");
                 return ret;
         }
@@ -80 +78 @@
 
         if (rtereg_conf[rtereg_conf_size-1].finished == 0) {
-                TRACE_DEBUG(INFO, "rt_ereg: configuration invalid, AVP ended without OCTETSTRING AVP");
+                LOG_E("[rt_ereg] configuration invalid, AVP ended without OCTETSTRING AVP");
                 return EINVAL;
         }
 
         if (ret != 0) {
-                TRACE_DEBUG(INFO, "rt_ereg: unable to parse the configuration file.");
+                LOG_E("[rt_ereg] unable to parse the configuration file.");
                 return EINVAL;
         } else {
@@ -92 +90 @@
                         sum += rtereg_conf[i].rules_nb;
                 }
-                TRACE_DEBUG(FULL, "[rt-ereg] Added %d rules successfully.", sum);
+                LOG_D("[rt-ereg] Added %d rules successfully.", sum);
         }
 
@@ -105 +103 @@
         if (rtereg_conf[rtereg_conf_size-1].finished) {
                 if ((ret = realloc(rtereg_conf, sizeof(*rtereg_conf)*(rtereg_conf_size+1))) == NULL) {
-                        TRACE_DEBUG(INFO, "rt_ereg: realloc failed");
+                        LOG_E("[rt_ereg] realloc failed");
                         return -1;
                 }
@@ -111 +109 @@
                 rtereg_conf = ret;
                 memset(&rtereg_conf[rtereg_conf_size-1], 0, sizeof(*rtereg_conf));
-                TRACE_DEBUG(INFO, "rt_ereg: New AVP group found starting with %s", name);
+                LOG_D("[rt_ereg] New AVP group found starting with %s", name);
         }
         level = rtereg_conf[rtereg_conf_size-1].level + 1;
 
         if ((ret = realloc(rtereg_conf[rtereg_conf_size-1].avps, sizeof(*rtereg_conf[rtereg_conf_size-1].avps)*level)) == NULL) {
-                TRACE_DEBUG(INFO, "rt_ereg: realloc failed");
+                LOG_E("[rt_ereg] realloc failed");
                 return -1;
         }
@@ -123 +121 @@
         CHECK_FCT_DO( fd_dict_search ( fd_g_config->cnf_dict, DICT_AVP, AVP_BY_NAME_ALL_VENDORS, name, &rtereg_conf[rtereg_conf_size-1].avps[level-1], ENOENT ),
                       {
-                              TRACE_DEBUG(INFO, "rt_ereg: Unable to find '%s' AVP in the loaded dictionaries.", name);
+                              LOG_E("[rt_ereg] Unable to find '%s' AVP in the loaded dictionaries.", name);
                               return -1;
                       } );
@@ -134 +132 @@
                         rtereg_conf[rtereg_conf_size-1].finished = 1;
                 } else if (data.avp_basetype != AVP_TYPE_GROUPED) {
-                        TRACE_DEBUG(INFO, "rt_ereg: '%s' AVP is not an OCTETSTRING nor GROUPED AVP (%d).", name, data.avp_basetype);
+                        LOG_E("[rt_ereg] '%s' AVP is not an OCTETSTRING nor GROUPED AVP (%d).", name, data.avp_basetype);
                         return -1;
                 }
@@ -148 +146 @@
 void yyerror (YYLTYPE *ploc, char * conffile, char const *s)
 {
-        TRACE_DEBUG(INFO, "rt_ereg: error in configuration parsing");
+        LOG_E("[rt_ereg] error in configuration parsing");
 
         if (ploc->first_line != ploc->last_line)
@@ -223 +221 @@
 
                                                 /* Error while compiling the regex */
-                                                TRACE_DEBUG(INFO, "rt_ereg: error while compiling the regular expression '%s':", new->pattern);
+                                                LOG_E("[rt_ereg] error while compiling the regular expression '%s':", new->pattern);
 
                                                 /* Get the error message size */
@@ -233 +231 @@
                                                 /* Get the error message content */
                                                 regerror(err, &new->preg, buf, bl);
-                                                TRACE_DEBUG(INFO, "\t%s", buf);
+                                                LOG_E("\t%s", buf);
 
                                                 /* Free the buffer, return the error */