Renamed the log macros to more specific names.

urmahp · urmahp · commit 20022051d72f · 2021-03-03T13:55:58.000+01:00
This makes it less likely that the log macros with have same name as log macros in the application where this library is used.
diff --git a/include/ur_client_library/comm/bin_parser.h b/include/ur_client_library/comm/bin_parser.h
@@ -368,7 +368,7 @@ class BinParser
    */
   void debug()
   {
-    LOG_DEBUG("BinParser: %p - %p (%zu bytes)", buf_pos_, buf_end_, buf_end_ - buf_pos_);
+    URCL_LOG_DEBUG("BinParser: %p - %p (%zu bytes)", buf_pos_, buf_end_, buf_end_ - buf_pos_);
   }
 };
 
diff --git a/include/ur_client_library/comm/pipeline.h b/include/ur_client_library/comm/pipeline.h
@@ -267,7 +267,7 @@ class Pipeline
    */
   virtual ~Pipeline()
   {
-    LOG_DEBUG("Destructing pipeline");
+    URCL_LOG_DEBUG("Destructing pipeline");
     stop();
   }
 
@@ -302,7 +302,7 @@ class Pipeline
     if (!running_)
       return;
 
-    LOG_DEBUG("Stopping pipeline! <%s>", name_.c_str());
+    URCL_LOG_DEBUG("Stopping pipeline! <%s>", name_.c_str());
 
     running_ = false;
 
@@ -342,7 +342,7 @@ class Pipeline
 
   void runProducer()
   {
-    LOG_DEBUG("Starting up producer");
+    URCL_LOG_DEBUG("Starting up producer");
     std::ifstream realtime_file("/sys/kernel/realtime", std::ios::in);
     bool has_realtime;
     realtime_file >> has_realtime;
@@ -363,7 +363,7 @@ class Pipeline
         int ret = pthread_setschedparam(this_thread, SCHED_FIFO, &params);
         if (ret != 0)
         {
-          LOG_ERROR("Unsuccessful in setting producer thread realtime priority. Error code: %d", ret);
+          URCL_LOG_ERROR("Unsuccessful in setting producer thread realtime priority. Error code: %d", ret);
         }
         // Now verify the change in thread priority
         int policy = 0;
@@ -376,24 +376,24 @@ class Pipeline
         // Check the correct policy was applied
         if (policy != SCHED_FIFO)
         {
-          LOG_ERROR("Producer thread: Scheduling is NOT SCHED_FIFO!");
+          URCL_LOG_ERROR("Producer thread: Scheduling is NOT SCHED_FIFO!");
         }
         else
         {
-          LOG_INFO("Producer thread: SCHED_FIFO OK");
+          URCL_LOG_INFO("Producer thread: SCHED_FIFO OK");
         }
 
         // Print thread scheduling priority
-        LOG_INFO("Thread priority is %d", params.sched_priority);
+        URCL_LOG_INFO("Thread priority is %d", params.sched_priority);
       }
       else
       {
-        LOG_ERROR("Could not get maximum thread priority for producer thread");
+        URCL_LOG_ERROR("Could not get maximum thread priority for producer thread");
       }
     }
     else
     {
-      LOG_WARN("No realtime capabilities found. Consider using a realtime system for better performance");
+      URCL_LOG_WARN("No realtime capabilities found. Consider using a realtime system for better performance");
     }
     std::vector<std::unique_ptr<T>> products;
     while (running_)
@@ -409,13 +409,13 @@ class Pipeline
       {
         if (!queue_.tryEnqueue(std::move(p)))
         {
-          LOG_ERROR("Pipeline producer overflowed! <%s>", name_.c_str());
+          URCL_LOG_ERROR("Pipeline producer overflowed! <%s>", name_.c_str());
         }
       }
 
       products.clear();
     }
-    LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());
+    URCL_LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());
     notifier_.stopped(name_);
   }
 
@@ -442,7 +442,7 @@ class Pipeline
       }
     }
     consumer_->stopConsumer();
-    LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str());
+    URCL_LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str());
     notifier_.stopped(name_);
   }
 };
diff --git a/include/ur_client_library/comm/producer.h b/include/ur_client_library/comm/producer.h
@@ -122,7 +122,7 @@ class URProducer : public IProducer<T>
       if (stream_.closed())
         return false;
 
-      LOG_WARN("Failed to read from stream, reconnecting in %ld seconds...", timeout_.count());
+      URCL_LOG_WARN("Failed to read from stream, reconnecting in %ld seconds...", timeout_.count());
       std::this_thread::sleep_for(timeout_);
 
       if (stream_.connect())
diff --git a/include/ur_client_library/comm/script_sender.h b/include/ur_client_library/comm/script_sender.h
@@ -83,7 +83,7 @@ class ScriptSender
       }
       if (requestRead())
       {
-        LOG_INFO("Robot requested program");
+        URCL_LOG_INFO("Robot requested program");
         sendProgram();
       }
       server_.disconnectClient();
@@ -105,12 +105,12 @@ class ScriptSender
       }
       else
       {
-        LOG_WARN("Received unexpected message on script request port ");
+        URCL_LOG_WARN("Received unexpected message on script request port ");
       }
     }
     else
     {
-      LOG_WARN("Could not read on script request port");
+      URCL_LOG_WARN("Could not read on script request port");
     }
     return false;
   }
@@ -123,11 +123,11 @@ class ScriptSender
 
     if (server_.write(data, len, written))
     {
-      LOG_INFO("Sent program to robot");
+      URCL_LOG_INFO("Sent program to robot");
     }
     else
     {
-      LOG_ERROR("Could not send program to robot");
+      URCL_LOG_ERROR("Could not send program to robot");
     }
   }
 };
diff --git a/include/ur_client_library/comm/shell_consumer.h b/include/ur_client_library/comm/shell_consumer.h
@@ -58,7 +58,7 @@ class ShellConsumer : public IConsumer<T>
    */
   virtual bool consume(std::shared_ptr<T> product)
   {
-    LOG_INFO("%s", product->toString().c_str());
+    URCL_LOG_INFO("%s", product->toString().c_str());
     return true;
   }
 
diff --git a/include/ur_client_library/comm/stream.h b/include/ur_client_library/comm/stream.h
@@ -68,7 +68,7 @@ class URStream : public TCPSocket
    */
   void disconnect()
   {
-    LOG_DEBUG("Disconnecting from %s:%d", host_.c_str(), port_);
+    URCL_LOG_DEBUG("Disconnecting from %s:%d", host_.c_str(), port_);
     TCPSocket::close();
   }
 
@@ -141,7 +141,7 @@ bool URStream<T>::read(uint8_t* buf, const size_t buf_len, size_t& total)
       remainder = T::HeaderType::getPackageLength(buf);
       if (remainder >= (buf_len - sizeof(typename T::HeaderType::_package_size_type)))
       {
-        LOG_ERROR("Packet size %zd is larger than buffer %zu, discarding.", remainder, buf_len);
+        URCL_LOG_ERROR("Packet size %zd is larger than buffer %zu, discarding.", remainder, buf_len);
         return false;
       }
       initial = false;
diff --git a/include/ur_client_library/log.h b/include/ur_client_library/log.h
@@ -22,18 +22,18 @@
 #ifdef ROS_BUILD
 #include <console_bridge/console.h>
 
-#define LOG_DEBUG CONSOLE_BRIDGE_logDebug
-#define LOG_WARN CONSOLE_BRIDGE_logWarn
-#define LOG_INFO CONSOLE_BRIDGE_logInform
-#define LOG_ERROR CONSOLE_BRIDGE_logError
-#define LOG_FATAL CONSOLE_BRIDGE_logError
+#define URCL_LOG_DEBUG CONSOLE_BRIDGE_logDebug
+#define URCL_LOG_WARN CONSOLE_BRIDGE_logWarn
+#define URCL_LOG_INFO CONSOLE_BRIDGE_logInform
+#define URCL_LOG_ERROR CONSOLE_BRIDGE_logError
+#define URCL_LOG_FATAL CONSOLE_BRIDGE_logError
 
 #else
 
-#define LOG_DEBUG(format, ...) printf("[DEBUG]: " format "\n", ##__VA_ARGS__)
-#define LOG_WARN(format, ...) printf("[WARNING]: " format "\n", ##__VA_ARGS__)
-#define LOG_INFO(format, ...) printf("[INFO]: " format "\n", ##__VA_ARGS__)
-#define LOG_ERROR(format, ...) printf("[ERROR]: " format "\n", ##__VA_ARGS__)
-#define LOG_FATAL(format, ...) printf("[FATAL]: " format "\n", ##__VA_ARGS__)
+#define URCL_LOG_DEBUG(format, ...) printf("[DEBUG]: " format "\n", ##__VA_ARGS__)
+#define URCL_LOG_WARN(format, ...) printf("[WARNING]: " format "\n", ##__VA_ARGS__)
+#define URCL_LOG_INFO(format, ...) printf("[INFO]: " format "\n", ##__VA_ARGS__)
+#define URCL_LOG_ERROR(format, ...) printf("[ERROR]: " format "\n", ##__VA_ARGS__)
+#define URCL_LOG_FATAL(format, ...) printf("[FATAL]: " format "\n", ##__VA_ARGS__)
 
 #endif
diff --git a/include/ur_client_library/primary/primary_parser.h b/include/ur_client_library/primary/primary_parser.h
@@ -67,13 +67,13 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>
         {
           if (!bp.checkSize(sizeof(uint32_t)))
           {
-            LOG_ERROR("Failed to read sub-package length, there's likely a parsing error");
+            URCL_LOG_ERROR("Failed to read sub-package length, there's likely a parsing error");
             return false;
           }
           uint32_t sub_size = bp.peek<uint32_t>();
           if (!bp.checkSize(static_cast<size_t>(sub_size)))
           {
-            LOG_WARN("Invalid sub-package size of %" PRIu32 " received!", sub_size);
+            URCL_LOG_WARN("Invalid sub-package size of %" PRIu32 " received!", sub_size);
             return false;
           }
 
@@ -95,15 +95,15 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>
 
           if (!packet->parseWith(sbp))
           {
-            LOG_ERROR("Sub-package parsing of type %d failed!", static_cast<int>(type));
+            URCL_LOG_ERROR("Sub-package parsing of type %d failed!", static_cast<int>(type));
             return false;
           }
 
           results.push_back(std::move(packet));
 
           if (!sbp.empty())
           {
-            LOG_ERROR("Sub-package of type %d was not parsed completely!", static_cast<int>(type));
+            URCL_LOG_ERROR("Sub-package of type %d was not parsed completely!", static_cast<int>(type));
             sbp.debug();
             return false;
           }
@@ -125,7 +125,7 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>
         std::unique_ptr<PrimaryPackage> packet(messageFromType(message_type, timestamp, source));
         if (!packet->parseWith(bp))
         {
-          LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(message_type));
+          URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(message_type));
           return false;
         }
 
@@ -136,7 +136,7 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>
 
       default:
       {
-        LOG_DEBUG("Invalid robot package type recieved: %u", static_cast<uint8_t>(type));
+        URCL_LOG_DEBUG("Invalid robot package type recieved: %u", static_cast<uint8_t>(type));
         bp.consume();
         return true;
       }
diff --git a/include/ur_client_library/rtde/rtde_parser.h b/include/ur_client_library/rtde/rtde_parser.h
@@ -75,7 +75,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>
 
     if (!bp.checkSize(size - sizeof(size) - sizeof(type)))
     {
-      LOG_ERROR("Buffer len shorter than expected packet length");
+      URCL_LOG_ERROR("Buffer len shorter than expected packet length");
       return false;
     }
 
@@ -87,7 +87,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>
 
         if (!package->parseWith(bp))
         {
-          LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));
+          URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));
           return false;
         }
         results.push_back(std::move(package));
@@ -98,7 +98,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>
         std::unique_ptr<RTDEPackage> package(packageFromType(type));
         if (!package->parseWith(bp))
         {
-          LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));
+          URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));
           return false;
         }
 
@@ -108,7 +108,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>
     }
     if (!bp.empty())
     {
-      LOG_ERROR("Package of type %d was not parsed completely!", static_cast<int>(type));
+      URCL_LOG_ERROR("Package of type %d was not parsed completely!", static_cast<int>(type));
       bp.debug();
       return false;
     }
diff --git a/src/comm/server.cpp b/src/comm/server.cpp
@@ -48,7 +48,7 @@ std::string URServer::getIP()
 
   if (res < 0)
   {
-    LOG_ERROR("Could not get local IP");
+    URCL_LOG_ERROR("Could not get local IP");
     return std::string();
   }
 
@@ -90,7 +90,7 @@ bool URServer::accept()
   int retry = 0;
   while ((client_fd = ::accept(getSocketFD(), &addr, &addr_len)) == -1)
   {
-    LOG_ERROR("Accepting socket connection failed. (errno: %d)", errno);
+    URCL_LOG_ERROR("Accepting socket connection failed. (errno: %d)", errno);
     if (retry++ >= 5)
       return false;
   }
diff --git a/src/comm/tcp_socket.cpp b/src/comm/tcp_socket.cpp
@@ -58,7 +58,7 @@ bool TCPSocket::setup(std::string& host, int port)
   if (state_ == SocketState::Connected)
     return false;
 
-  LOG_DEBUG("Setting up connection: %s:%d", host.c_str(), port);
+  URCL_LOG_DEBUG("Setting up connection: %s:%d", host.c_str(), port);
 
   // gethostbyname() is deprecated so use getadderinfo() as described in:
   // http://www.beej.us/guide/bgnet/output/html/multipage/syscalls.html#getaddrinfo
@@ -74,7 +74,7 @@ bool TCPSocket::setup(std::string& host, int port)
 
   if (getaddrinfo(host_name, service.c_str(), &hints, &result) != 0)
   {
-    LOG_ERROR("Failed to get address for %s:%d", host.c_str(), port);
+    URCL_LOG_ERROR("Failed to get address for %s:%d", host.c_str(), port);
     return false;
   }
 
@@ -96,13 +96,13 @@ bool TCPSocket::setup(std::string& host, int port)
   if (!connected)
   {
     state_ = SocketState::Invalid;
-    LOG_ERROR("Connection setup failed for %s:%d", host.c_str(), port);
+    URCL_LOG_ERROR("Connection setup failed for %s:%d", host.c_str(), port);
   }
   else
   {
     setOptions(socket_fd_);
     state_ = SocketState::Connected;
-    LOG_DEBUG("Connection established for %s:%d", host.c_str(), port);
+    URCL_LOG_DEBUG("Connection established for %s:%d", host.c_str(), port);
   }
   return connected;
 }
@@ -134,7 +134,7 @@ std::string TCPSocket::getIP() const
 
   if (res < 0)
   {
-    LOG_ERROR("Could not get local IP");
+    URCL_LOG_ERROR("Could not get local IP");
     return std::string();
   }
 
@@ -179,7 +179,7 @@ bool TCPSocket::write(const uint8_t* buf, const size_t buf_len, size_t& written)
 
   if (state_ != SocketState::Connected)
   {
-    LOG_ERROR("Attempt to write on a non-connected socket");
+    URCL_LOG_ERROR("Attempt to write on a non-connected socket");
     return false;
   }
 
@@ -192,7 +192,7 @@ bool TCPSocket::write(const uint8_t* buf, const size_t buf_len, size_t& written)
 
     if (sent <= 0)
     {
-      LOG_ERROR("Sending data through socket failed.");
+      URCL_LOG_ERROR("Sending data through socket failed.");
       return false;
     }
 
diff --git a/src/rtde/rtde_client.cpp b/src/rtde/rtde_client.cpp
diff --git a/src/rtde/rtde_writer.cpp b/src/rtde/rtde_writer.cpp
diff --git a/src/ur/calibration_checker.cpp b/src/ur/calibration_checker.cpp
diff --git a/src/ur/dashboard_client.cpp b/src/ur/dashboard_client.cpp
diff --git a/src/ur/ur_driver.cpp b/src/ur/ur_driver.cpp

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ class BinParser`
`368`	`368`	`*/`
`369`	`369`	`void debug()`
`370`	`370`	`{`
`371`		`- LOG_DEBUG("BinParser: %p - %p (%zu bytes)", buf_pos_, buf_end_, buf_end_ - buf_pos_);`
	`371`	`+ URCL_LOG_DEBUG("BinParser: %p - %p (%zu bytes)", buf_pos_, buf_end_, buf_end_ - buf_pos_);`
`372`	`372`	`}`
`373`	`373`	`};`
`374`	`374`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ class Pipeline`
`267`	`267`	`*/`
`268`	`268`	`virtual ~Pipeline()`
`269`	`269`	`{`
`270`		`- LOG_DEBUG("Destructing pipeline");`
	`270`	`+ URCL_LOG_DEBUG("Destructing pipeline");`
`271`	`271`	`stop();`
`272`	`272`	`}`
`273`	`273`
`@@ -302,7 +302,7 @@ class Pipeline`
`302`	`302`	`if (!running_)`
`303`	`303`	`return;`
`304`	`304`
`305`		`- LOG_DEBUG("Stopping pipeline! <%s>", name_.c_str());`
	`305`	`+ URCL_LOG_DEBUG("Stopping pipeline! <%s>", name_.c_str());`
`306`	`306`
`307`	`307`	`running_ = false;`
`308`	`308`
`@@ -342,7 +342,7 @@ class Pipeline`
`342`	`342`
`343`	`343`	`void runProducer()`
`344`	`344`	`{`
`345`		`- LOG_DEBUG("Starting up producer");`
	`345`	`+ URCL_LOG_DEBUG("Starting up producer");`
`346`	`346`	`std::ifstream realtime_file("/sys/kernel/realtime", std::ios::in);`
`347`	`347`	`bool has_realtime;`
`348`	`348`	`realtime_file >> has_realtime;`
`@@ -363,7 +363,7 @@ class Pipeline`
`363`	`363`	`int ret = pthread_setschedparam(this_thread, SCHED_FIFO, &params);`
`364`	`364`	`if (ret != 0)`
`365`	`365`	`{`
`366`		`- LOG_ERROR("Unsuccessful in setting producer thread realtime priority. Error code: %d", ret);`
	`366`	`+ URCL_LOG_ERROR("Unsuccessful in setting producer thread realtime priority. Error code: %d", ret);`
`367`	`367`	`}`
`368`	`368`	`// Now verify the change in thread priority`
`369`	`369`	`int policy = 0;`
`@@ -376,24 +376,24 @@ class Pipeline`
`376`	`376`	`// Check the correct policy was applied`
`377`	`377`	`if (policy != SCHED_FIFO)`
`378`	`378`	`{`
`379`		`- LOG_ERROR("Producer thread: Scheduling is NOT SCHED_FIFO!");`
	`379`	`+ URCL_LOG_ERROR("Producer thread: Scheduling is NOT SCHED_FIFO!");`
`380`	`380`	`}`
`381`	`381`	`else`
`382`	`382`	`{`
`383`		`- LOG_INFO("Producer thread: SCHED_FIFO OK");`
	`383`	`+ URCL_LOG_INFO("Producer thread: SCHED_FIFO OK");`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`// Print thread scheduling priority`
`387`		`- LOG_INFO("Thread priority is %d", params.sched_priority);`
	`387`	`+ URCL_LOG_INFO("Thread priority is %d", params.sched_priority);`
`388`	`388`	`}`
`389`	`389`	`else`
`390`	`390`	`{`
`391`		`- LOG_ERROR("Could not get maximum thread priority for producer thread");`
	`391`	`+ URCL_LOG_ERROR("Could not get maximum thread priority for producer thread");`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`	`else`
`395`	`395`	`{`
`396`		`- LOG_WARN("No realtime capabilities found. Consider using a realtime system for better performance");`
	`396`	`+ URCL_LOG_WARN("No realtime capabilities found. Consider using a realtime system for better performance");`
`397`	`397`	`}`
`398`	`398`	`std::vector<std::unique_ptr<T>> products;`
`399`	`399`	`while (running_)`
`@@ -409,13 +409,13 @@ class Pipeline`
`409`	`409`	`{`
`410`	`410`	`if (!queue_.tryEnqueue(std::move(p)))`
`411`	`411`	`{`
`412`		`- LOG_ERROR("Pipeline producer overflowed! <%s>", name_.c_str());`
	`412`	`+ URCL_LOG_ERROR("Pipeline producer overflowed! <%s>", name_.c_str());`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`products.clear();`
`417`	`417`	`}`
`418`		`- LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());`
	`418`	`+ URCL_LOG_DEBUG("Pipeline producer ended! <%s>", name_.c_str());`
`419`	`419`	`notifier_.stopped(name_);`
`420`	`420`	`}`
`421`	`421`
`@@ -442,7 +442,7 @@ class Pipeline`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`	`consumer_->stopConsumer();`
`445`		`- LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str());`
	`445`	`+ URCL_LOG_DEBUG("Pipeline consumer ended! <%s>", name_.c_str());`
`446`	`446`	`notifier_.stopped(name_);`
`447`	`447`	`}`
`448`	`448`	`};`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class ScriptSender`
`83`	`83`	`}`
`84`	`84`	`if (requestRead())`
`85`	`85`	`{`
`86`		`- LOG_INFO("Robot requested program");`
	`86`	`+ URCL_LOG_INFO("Robot requested program");`
`87`	`87`	`sendProgram();`
`88`	`88`	`}`
`89`	`89`	`server_.disconnectClient();`
`@@ -105,12 +105,12 @@ class ScriptSender`
`105`	`105`	`}`
`106`	`106`	`else`
`107`	`107`	`{`
`108`		`- LOG_WARN("Received unexpected message on script request port ");`
	`108`	`+ URCL_LOG_WARN("Received unexpected message on script request port ");`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`else`
`112`	`112`	`{`
`113`		`- LOG_WARN("Could not read on script request port");`
	`113`	`+ URCL_LOG_WARN("Could not read on script request port");`
`114`	`114`	`}`
`115`	`115`	`return false;`
`116`	`116`	`}`
`@@ -123,11 +123,11 @@ class ScriptSender`
`123`	`123`
`124`	`124`	`if (server_.write(data, len, written))`
`125`	`125`	`{`
`126`		`- LOG_INFO("Sent program to robot");`
	`126`	`+ URCL_LOG_INFO("Sent program to robot");`
`127`	`127`	`}`
`128`	`128`	`else`
`129`	`129`	`{`
`130`		`- LOG_ERROR("Could not send program to robot");`
	`130`	`+ URCL_LOG_ERROR("Could not send program to robot");`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`};`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class ShellConsumer : public IConsumer<T>`
`58`	`58`	`*/`
`59`	`59`	`virtual bool consume(std::shared_ptr<T> product)`
`60`	`60`	`{`
`61`		`- LOG_INFO("%s", product->toString().c_str());`
	`61`	`+ URCL_LOG_INFO("%s", product->toString().c_str());`
`62`	`62`	`return true;`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class URStream : public TCPSocket`
`68`	`68`	`*/`
`69`	`69`	`void disconnect()`
`70`	`70`	`{`
`71`		`- LOG_DEBUG("Disconnecting from %s:%d", host_.c_str(), port_);`
	`71`	`+ URCL_LOG_DEBUG("Disconnecting from %s:%d", host_.c_str(), port_);`
`72`	`72`	`TCPSocket::close();`
`73`	`73`	`}`
`74`	`74`
`@@ -141,7 +141,7 @@ bool URStream<T>::read(uint8_t* buf, const size_t buf_len, size_t& total)`
`141`	`141`	`remainder = T::HeaderType::getPackageLength(buf);`
`142`	`142`	`if (remainder >= (buf_len - sizeof(typename T::HeaderType::_package_size_type)))`
`143`	`143`	`{`
`144`		`- LOG_ERROR("Packet size %zd is larger than buffer %zu, discarding.", remainder, buf_len);`
	`144`	`+ URCL_LOG_ERROR("Packet size %zd is larger than buffer %zu, discarding.", remainder, buf_len);`
`145`	`145`	`return false;`
`146`	`146`	`}`
`147`	`147`	`initial = false;`
Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,13 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>`
`67`	`67`	`{`
`68`	`68`	`if (!bp.checkSize(sizeof(uint32_t)))`
`69`	`69`	`{`
`70`		`- LOG_ERROR("Failed to read sub-package length, there's likely a parsing error");`
	`70`	`+ URCL_LOG_ERROR("Failed to read sub-package length, there's likely a parsing error");`
`71`	`71`	`return false;`
`72`	`72`	`}`
`73`	`73`	`uint32_t sub_size = bp.peek<uint32_t>();`
`74`	`74`	`if (!bp.checkSize(static_cast<size_t>(sub_size)))`
`75`	`75`	`{`
`76`		`- LOG_WARN("Invalid sub-package size of %" PRIu32 " received!", sub_size);`
	`76`	`+ URCL_LOG_WARN("Invalid sub-package size of %" PRIu32 " received!", sub_size);`
`77`	`77`	`return false;`
`78`	`78`	`}`
`79`	`79`
`@@ -95,15 +95,15 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>`
`95`	`95`
`96`	`96`	`if (!packet->parseWith(sbp))`
`97`	`97`	`{`
`98`		`- LOG_ERROR("Sub-package parsing of type %d failed!", static_cast<int>(type));`
	`98`	`+ URCL_LOG_ERROR("Sub-package parsing of type %d failed!", static_cast<int>(type));`
`99`	`99`	`return false;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`results.push_back(std::move(packet));`
`103`	`103`
`104`	`104`	`if (!sbp.empty())`
`105`	`105`	`{`
`106`		`- LOG_ERROR("Sub-package of type %d was not parsed completely!", static_cast<int>(type));`
	`106`	`+ URCL_LOG_ERROR("Sub-package of type %d was not parsed completely!", static_cast<int>(type));`
`107`	`107`	`sbp.debug();`
`108`	`108`	`return false;`
`109`	`109`	`}`
`@@ -125,7 +125,7 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>`
`125`	`125`	`std::unique_ptr<PrimaryPackage> packet(messageFromType(message_type, timestamp, source));`
`126`	`126`	`if (!packet->parseWith(bp))`
`127`	`127`	`{`
`128`		`- LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(message_type));`
	`128`	`+ URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(message_type));`
`129`	`129`	`return false;`
`130`	`130`	`}`
`131`	`131`
`@@ -136,7 +136,7 @@ class PrimaryParser : public comm::Parser<PrimaryPackage>`
`136`	`136`
`137`	`137`	`default:`
`138`	`138`	`{`
`139`		`- LOG_DEBUG("Invalid robot package type recieved: %u", static_cast<uint8_t>(type));`
	`139`	`+ URCL_LOG_DEBUG("Invalid robot package type recieved: %u", static_cast<uint8_t>(type));`
`140`	`140`	`bp.consume();`
`141`	`141`	`return true;`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>`
`75`	`75`
`76`	`76`	`if (!bp.checkSize(size - sizeof(size) - sizeof(type)))`
`77`	`77`	`{`
`78`		`- LOG_ERROR("Buffer len shorter than expected packet length");`
	`78`	`+ URCL_LOG_ERROR("Buffer len shorter than expected packet length");`
`79`	`79`	`return false;`
`80`	`80`	`}`
`81`	`81`
`@@ -87,7 +87,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>`
`87`	`87`
`88`	`88`	`if (!package->parseWith(bp))`
`89`	`89`	`{`
`90`		`- LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));`
	`90`	`+ URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));`
`91`	`91`	`return false;`
`92`	`92`	`}`
`93`	`93`	`results.push_back(std::move(package));`
`@@ -98,7 +98,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>`
`98`	`98`	`std::unique_ptr<RTDEPackage> package(packageFromType(type));`
`99`	`99`	`if (!package->parseWith(bp))`
`100`	`100`	`{`
`101`		`- LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));`
	`101`	`+ URCL_LOG_ERROR("Package parsing of type %d failed!", static_cast<int>(type));`
`102`	`102`	`return false;`
`103`	`103`	`}`
`104`	`104`
`@@ -108,7 +108,7 @@ class RTDEParser : public comm::Parser<RTDEPackage>`
`108`	`108`	`}`
`109`	`109`	`if (!bp.empty())`
`110`	`110`	`{`
`111`		`- LOG_ERROR("Package of type %d was not parsed completely!", static_cast<int>(type));`
	`111`	`+ URCL_LOG_ERROR("Package of type %d was not parsed completely!", static_cast<int>(type));`
`112`	`112`	`bp.debug();`
`113`	`113`	`return false;`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ std::string URServer::getIP()`
`48`	`48`
`49`	`49`	`if (res < 0)`
`50`	`50`	`{`
`51`		`- LOG_ERROR("Could not get local IP");`
	`51`	`+ URCL_LOG_ERROR("Could not get local IP");`
`52`	`52`	`return std::string();`
`53`	`53`	`}`
`54`	`54`
`@@ -90,7 +90,7 @@ bool URServer::accept()`
`90`	`90`	`int retry = 0;`
`91`	`91`	`while ((client_fd = ::accept(getSocketFD(), &addr, &addr_len)) == -1)`
`92`	`92`	`{`
`93`		`- LOG_ERROR("Accepting socket connection failed. (errno: %d)", errno);`
	`93`	`+ URCL_LOG_ERROR("Accepting socket connection failed. (errno: %d)", errno);`
`94`	`94`	`if (retry++ >= 5)`
`95`	`95`	`return false;`
`96`	`96`	`}`