added two more wrapper calls from log4c

diff --git a/org.glite.lbjp-common.log/src/log.c b/org.glite.lbjp-common.log/src/log.c
index fa7792b..ec72761 100644 (file)
--- a/org.glite.lbjp-common.log/src/log.c
+++ b/org.glite.lbjp-common.log/src/log.c
@@ -93,6 +93,40 @@ void glite_common_log(char *catName,int a_priority, const char* a_format,...) {
 #endif
 }
 
+const char *glite_common_log_priority_to_string(int a_priority) {
+#ifndef WITHOUT_LOG4C
+       return log4c_priority_to_string(a_priority);
+#else
+       char *out;
+
+       switch (priority) {
+       case LOG_PRIORITY_FATAL: out=strdup("FATAL");   break;
+       case LOG_PRIORITY_ERROR: out=strdup("ERROR");   break;
+       case LOG_PRIORITY_WARN:  out=strdup("WARNING"); break;
+       case LOG_PRIORITY_INFO:  out=strdup("INFO");    break;
+       case LOG_PRIORITY_DEBUG: out=strdup("DEBUG");   break;
+       case LOG_PRIORITY_NOTSET:
+       default:
+               out=strdup("PRIORITY_NOT_SET"); 
+       }
+       return out;
+#endif
+}
+
+/**
+ * Returns priority of a given category
+ */
+int glite_common_log_get_priority(const char *catName) {
+#ifndef WITHOUT_LOG4C
+       return log4c_category_get_priority(log4c_category_get(catName));
+#else
+       /* if not LOG4C, mapping of priorities to categories 
+        * must be specified somehow differently (not specified at the moment)
+        */
+       return LOG_PRIORITY_NOTSET;
+#endif
+}
+
 /*
  * Rereads any log4crc files that have changed
  */

diff --git a/org.glite.lbjp-common.log/src/log.h b/org.glite.lbjp-common.log/src/log.h
index d6eff3f..5e31d28 100644 (file)
--- a/org.glite.lbjp-common.log/src/log.h
+++ b/org.glite.lbjp-common.log/src/log.h
@@ -37,7 +37,6 @@ extern "C" {
 #define LOG_CATEGORY_LB_SERVER                 "LB.SERVER"
 #define LOG_CATEGORY_LB_SERVER_DB      "LB.SERVER.DB"
 #define LOG_CATEGORY_LB_SERVER_REQUEST "LB.SERVER.REQUEST"
-#define LOG_CATEGORY_LB_HARVESTER       "LB.HARVESTER"
 #define LOG_CATEGORY_LB_HARVESTER_DB    "LB.HARVESTER.DB"
 
 /* default priorities
@@ -69,7 +68,7 @@ extern int glite_common_log_fini(void);
 /** 
  * Log a message with the specified priority.
  * @param catName category name
- * @param a_priority The priority of this log message.
+ * @param a_priority priority of this log message.
  * @param msg message
  **/
 extern void glite_common_log_msg(char *catName,int a_priority, char *msg);
@@ -83,12 +82,23 @@ extern void glite_common_log_msg(char *catName,int a_priority, char *msg);
  **/
 extern void glite_common_log(char *catName,int a_priority, const char* a_format,...);
 
-/*
+/**
+ * Returns priority as a string 
+ * @param a_priority priority number
+ */
+extern const char *glite_common_log_priority_to_string(int a_priority);
+
+/**
+ * Returns priority of a given category
+ * @param catName category name
+ */
+extern int glite_common_log_get_priority(const char *catName);
+
+/**
  * Rereads any log4crc files that have changed
  */
 extern void glite_common_log_reread(void);
 
-
 /* simple wrappers around glite_common_log() that include also errno */
 #define glite_common_log_SYS_ERROR(my_err) { \
         if (errno !=0 ) \