gr-blocks: Squelch debug messages in file sink.

Signed-off-by: Ron Economos <[email protected]>

Author: drmpeg

gr-blocks/include/gnuradio/blocks/file_sink_base.h

@@ -32,13 +32,14 @@ class BLOCKS_API file_sink_base
     boost::mutex d_mutex;
     bool d_unbuffered;
     bool d_append;
-    gr::logger d_base_logger;
+    gr::logger_ptr d_base_logger;
+    gr::logger_ptr d_base_debug_logger;
 
 protected:
     file_sink_base(const char* filename, bool is_binary, bool append);
 
 public:
-    file_sink_base() : d_base_logger("unitialized file_sink_base") {}
+    file_sink_base() {}
     ~file_sink_base();
 
     /*!

gr-blocks/lib/file_sink_base.cc

@@ -43,20 +43,16 @@ namespace gr {
 namespace blocks {
 
 file_sink_base::file_sink_base(const char* filename, bool is_binary, bool append)
-    : d_fp(0),
-      d_new_fp(0),
-      d_updated(false),
-      d_is_binary(is_binary),
-      d_append(append),
-      d_base_logger("file_sink_base")
+    : d_fp(0), d_new_fp(0), d_updated(false), d_is_binary(is_binary), d_append(append)
 {
+    gr::configure_default_loggers(d_base_logger, d_base_debug_logger, "file_sink_base");
     if (!open(filename))
         throw std::runtime_error("can't open file");
 }
 
 file_sink_base::~file_sink_base()
 {
-    d_base_logger.info("[destructor] Closing file");
+    d_base_debug_logger->debug("[destructor] Closing file");
     close();
     if (d_fp) {
         fclose(d_fp);
@@ -67,7 +63,7 @@ file_sink_base::~file_sink_base()
 bool file_sink_base::open(const char* filename)
 {
     gr::thread::scoped_lock guard(d_mutex); // hold mutex for duration of this function
-    d_base_logger.info("opening file {:s}", filename);
+    d_base_debug_logger->debug("opening file {:s}", filename);
 
     // we use the open system call to get access to the O_LARGEFILE flag.
     int fd;
@@ -79,7 +75,7 @@ bool file_sink_base::open(const char* filename)
         flags = O_WRONLY | O_CREAT | O_TRUNC | OUR_O_LARGEFILE | OUR_O_BINARY;
     }
     if ((fd = ::open(filename, flags, 0664)) < 0) {
-        d_base_logger.error("[::open] {:s}: {:s}", filename, strerror(errno));
+        d_base_logger->error("[::open] {:s}: {:s}", filename, strerror(errno));
         return false;
     }
     if (d_new_fp) { // if we've already got a new one open, close it
@@ -88,7 +84,7 @@ bool file_sink_base::open(const char* filename)
     }
 
     if ((d_new_fp = fdopen(fd, d_is_binary ? "wb" : "w")) == NULL) {
-        d_base_logger.error("[fdopen] {:s}: {:s}", filename, strerror(errno));
+        d_base_logger->error("[fdopen] {:s}: {:s}", filename, strerror(errno));
         ::close(fd); // don't leak file descriptor if fdopen fails.
     }
 
@@ -100,7 +96,7 @@ void file_sink_base::close()
 {
     gr::thread::scoped_lock guard(d_mutex); // hold mutex for duration of this function
 
-    d_base_logger.info("Closing file");
+    d_base_debug_logger->debug("Closing file");
     if (d_new_fp) {
         fclose(d_new_fp);
         d_new_fp = 0;
@@ -112,7 +108,7 @@ void file_sink_base::do_update()
 {
     if (d_updated) {
         gr::thread::scoped_lock guard(d_mutex); // hold mutex for duration of this block
-        d_base_logger.info("updating");
+        d_base_debug_logger->debug("updating");
         if (d_fp)
             fclose(d_fp);
         d_fp = d_new_fp; // install new file pointer
@@ -123,7 +119,7 @@ void file_sink_base::do_update()
 
 void file_sink_base::set_unbuffered(bool unbuffered)
 {
-    d_base_logger.info("Setting to {:s}buffered state", unbuffered ? "un" : "");
+    d_base_debug_logger->debug("Setting to {:s}buffered state", unbuffered ? "un" : "");
     d_unbuffered = unbuffered;
 }
 

gr-blocks/python/blocks/bindings/file_sink_base_python.cc

@@ -14,7 +14,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
 /* BINDTOOL_USE_PYGCCXML(0)                                                        */
 /* BINDTOOL_HEADER_FILE(file_sink_base.h)                                        */
-/* BINDTOOL_HEADER_FILE_HASH(b832eef38e5444b08f329837184e86c8)                     */
+/* BINDTOOL_HEADER_FILE_HASH(c567888586a246a945067bdad44c874c)                     */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>