Add swss::Logger to c-api (#969)

* Create c-api for logger

* Remove the include of logger_ut.h

* Call SWSSLogger_restartLogger to start logger thread

* Remove include of cstring

Author: yue-fred-gao

common/Makefile.am

@@ -80,6 +80,7 @@ common_libswsscommon_la_SOURCES = \
     common/c-api/zmqconsumerstatetable.cpp \
     common/c-api/zmqproducerstatetable.cpp \
     common/c-api/table.cpp                 \
+    common/c-api/logger.cpp \
     common/performancetimer.cpp
 
 common_libswsscommon_la_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CFLAGS) $(CODE_COVERAGE_CXXFLAGS)

common/c-api/logger.cpp

@@ -0,0 +1,28 @@
+#include <string>
+
+#include "../logger.h"
+#include "logger.h"
+#include "util.h"
+
+using namespace swss;
+using namespace std;
+
+SWSSResult SWSSLogger_linkToDbWithOutput(const char *dbName, SWSSPriorityChangeNotify prioChangeNotify, const char *defLogLevel, SWSSOutputChangeNotify outputChangeNotify, const char *defOutput) {
+    std::string logLevelStr(defLogLevel);
+    std::string outputStr(defOutput);
+    
+    SWSSTry(Logger::linkToDbWithOutput(string(dbName), 
+        [prioChangeNotify](std::string component, std::string newPriority) {
+                prioChangeNotify(component.c_str(), newPriority.c_str());  // Convert std::string to const char*
+        },
+        logLevelStr, 
+        [outputChangeNotify](std::string component, std::string newOutput) {
+                outputChangeNotify(component.c_str(), newOutput.c_str());  // Convert std::string to const char*
+        },
+        outputStr));
+}
+
+SWSSResult SWSSLogger_restartLogger() {
+    SWSSTry(Logger::restartLogger());
+}
+

common/c-api/logger.h

@@ -0,0 +1,21 @@
+#ifndef SWSS_COMMON_C_API_LOGGER_H
+#define SWSS_COMMON_C_API_LOGGER_H
+
+#include "result.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+typedef void (*SWSSOutputChangeNotify) (const char* component, const char* outputStr);
+typedef void (*SWSSPriorityChangeNotify) (const char* component, const char* outputStr);
+SWSSResult SWSSLogger_linkToDbWithOutput(const char *dbName, SWSSPriorityChangeNotify prioChangeNotify, const char *defLogLevel, SWSSOutputChangeNotify outputChangeNotify, const char *defOutput);
+SWSSResult SWSSLogger_restartLogger();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

tests/c_api_ut.cpp

@@ -14,13 +14,18 @@
 #include "common/c-api/zmqconsumerstatetable.h"
 #include "common/c-api/zmqproducerstatetable.h"
 #include "common/c-api/zmqserver.h"
+#include "common/c-api/logger.h"
 #include "common/select.h"
 #include "common/subscriberstatetable.h"
 #include "gtest/gtest.h"
 
 using namespace std;
 using namespace swss;
 
+static char LOG_LEVEL_FOR_TEST[32] = "";
+static char LOG_OUTPUT_FOR_TEST[32] = "";
+static const char* LOG_NAME_FOR_TEST = "test";
+
 static void clearDB() {
     DBConnector db("TEST_DB", 0, true);
     RedisReply r(&db, "FLUSHALL", REDIS_REPLY_STATUS);
@@ -87,6 +92,20 @@ struct SWSSStringManager {
     }
 };
 
+void logLevelNotify(const char* component, const char* prioStr)
+{
+    if (strcmp(component, LOG_NAME_FOR_TEST) != 0)
+        return;
+    strncpy(LOG_LEVEL_FOR_TEST, prioStr, sizeof(LOG_LEVEL_FOR_TEST)-1);
+}
+
+void logOutputNotify(const char* component, const char* outputStr)
+{
+    if (strcmp(component, LOG_NAME_FOR_TEST) != 0)
+        return;
+    strncpy(LOG_OUTPUT_FOR_TEST, outputStr, sizeof(LOG_OUTPUT_FOR_TEST)-1);
+}
+
 TEST(c_api, DBConnector) {
     clearDB();
     SWSSStringManager sm;
@@ -483,3 +502,40 @@ TEST(c_api, exceptions) {
     SWSSString_free(result.location);
     SWSSString_free(result.message);
 }
+
+TEST(c_api, Logger) {
+    
+    clearDB();
+    SWSSStringManager sm;
+
+    SWSSDBConnector db;
+    SWSSFieldValueArray fvs;
+
+    SWSSDBConnector_new_named("CONFIG_DB", 1000, true, &db);
+
+    SWSSLogger_linkToDbWithOutput(LOG_NAME_FOR_TEST, logLevelNotify, "NOTICE", logOutputNotify, "SYSLOG");
+    SWSSLogger_restartLogger();
+
+    sleep(1);
+
+    cout << "Checking log level for " << LOG_NAME_FOR_TEST << endl;
+    EXPECT_STREQ(LOG_LEVEL_FOR_TEST, "NOTICE");
+    cout << "Checking log output for " << LOG_NAME_FOR_TEST << endl;
+    EXPECT_STREQ(LOG_OUTPUT_FOR_TEST, "SYSLOG");
+
+    cout << "Setting log level/output for " << LOG_NAME_FOR_TEST << endl;
+    SWSSTable tbl;
+    SWSSTable_new(db, "LOGGER", &tbl);
+    SWSSFieldValueTuple data[2] = {{.field = DAEMON_LOGLEVEL, .value = sm.makeString("DEBUG")},
+                                   {.field = DAEMON_LOGOUTPUT, .value = sm.makeString("STDOUT")}};
+    fvs.len = 2;
+    fvs.data = data;
+    SWSSTable_set(tbl, LOG_NAME_FOR_TEST, fvs);
+
+    sleep(1);
+
+    cout << "Checking log level for " << LOG_NAME_FOR_TEST << endl;
+    EXPECT_STREQ(LOG_LEVEL_FOR_TEST, "DEBUG");
+    cout << "Checking log output for " << LOG_NAME_FOR_TEST << endl;
+    EXPECT_STREQ(LOG_OUTPUT_FOR_TEST, "STDOUT");
+}