Modify some ff_log code.

diff --git a/example/main_zc.c b/example/main_zc.c
index 90189efc75159fd326ce00653012de1ad4a829e2..0c4b821042b3d850cb86924f5d735fd18ba52614 100644 (file)
--- a/example/main_zc.c
+++ b/example/main_zc.c
@@ -202,7 +202,7 @@ int loop(void *arg)
             /* Or call ff_zc_mbuf_write one time */
             /*
             if (ret != buf_len) {
-                printf("ff_zc_mbuf_write failed, len:%d, errno:%d, %s\n", buf_len, errno, strerror(errno));
+                ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_APP, "ff_zc_mbuf_write failed, len:%d, errno:%d, %s\n", buf_len, errno, strerror(errno));
                 exit(1);
             }
             */

diff --git a/lib/ff_dpdk_if.c b/lib/ff_dpdk_if.c
index 67fa1200861774864c3e29d5bad7e60aefe4947b..9cc7b44c8f9166bb1002b7be5aa4f69da09658a8 100644 (file)
--- a/lib/ff_dpdk_if.c
+++ b/lib/ff_dpdk_if.c
@@ -781,7 +781,7 @@ init_port_start(void)
             static uint16_t nb_txd = TX_QUEUE_SIZE;
             ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, &nb_txd);
             if (ret < 0)
-                ff_log(FF_LOG_INFO, FF_LOGTYPE_FSTACK_LIB, "Could not adjust number of descriptors "
+                ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_LIB, "Could not adjust number of descriptors "
                         "for port%u (%d)\n", (unsigned)port_id, ret);
 
             uint16_t q;
@@ -855,7 +855,7 @@ init_port_start(void)
                 if (ret == 0) {
                     ff_log(FF_LOG_INFO, FF_LOGTYPE_FSTACK_LIB, "set port %u to promiscuous mode ok\n", port_id);
                 } else {
-                    ff_log(FF_LOG_INFO, FF_LOGTYPE_FSTACK_LIB, "set port %u to promiscuous mode error\n", port_id);
+                    ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_LIB, "set port %u to promiscuous mode error\n", port_id);
                 }
             }
         }
@@ -918,7 +918,7 @@ port_flow_complain(struct rte_flow_error *error)
         errstr = "unknown type";
     else
         errstr = errstrlist[error->type];
-    ff_log(FF_LOG_INFO, FF_LOGTYPE_FSTACK_LIB, "Caught error type %d (%s): %s%s: %s\n",
+    ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_LIB, "Caught error type %d (%s): %s%s: %s\n",
            error->type, errstr,
            error->cause ? (snprintf(buf, sizeof(buf), "cause: %p, ",
                                     error->cause), buf) : "",
@@ -1202,7 +1202,7 @@ create_ipip_flow(uint16_t port_id) {
         ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_LIB, "Flow rule validation failed: %s\n", error.message);
         return -error.type;
     }
-    ff_log(FF_LOG_ERR, FF_LOGTYPE_FSTACK_LIB, "IPIP flow rule created successfully (port %d, RSS level=%d)\n", port_id, rss.level);
+    ff_log(FF_LOG_INFO, FF_LOGTYPE_FSTACK_LIB, "IPIP flow rule created successfully (port %d, RSS level=%d)\n", port_id, rss.level);
     return 0;
 }
 #endif

diff --git a/lib/ff_log.c b/lib/ff_log.c
index 5794e8a7cee0c2c5f202d40af354d01e5af93a44..e000772f8799be20fde2bff1f17f846a8199b89c 100644 (file)
--- a/lib/ff_log.c
+++ b/lib/ff_log.c
@@ -67,8 +67,10 @@ ff_log_open_set(void)
 void
 ff_log_close(void)
 {
-    if (ff_global_cfg.log.f)
+    if (ff_global_cfg.log.f) {
         fclose(ff_global_cfg.log.f);
+        ff_global_cfg.log.f = NULL;
+    }
 }
 
 int