Add back the logging

12 files changed, 34 insertions, 1 deletions

diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index 9a5cf7cbd64..b5c93090566 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("echo_client");
+
 class EchoClient : public FastOS_Application
 {
 public:
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index 2bf740f7b1e..b40085e3db6 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_callback_client");
+
 struct RPC : public FRT_Invokable
 {
     uint32_t invokeCnt;
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 67eac0743d6..1e0a595fe80 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_callback_server");
+
 struct RPC : public FRT_Invokable
 {
     void CallBack(FRT_RPCRequest *req);
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index 435bfb6f08c..0b5be4a5510 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_client");
+
 class RPCClient : public FastOS_Application
 {
 public:
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index ae9eafa210d..841bc9228f7 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_info");
+
 class RPCInfo : public FastOS_Application
 {
 public:
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index 1bb572a6025..d5ade794a73 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_invoke");
+
 class RPCClient : public FastOS_Application
 {
 private:
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index e73f556b9d8..9527b0df6b6 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -2,6 +2,9 @@
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_proxy");
 //-----------------------------------------------------------------------------
 
 struct Session
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 2b7e16b91b6..b05fe15f663 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_server");
+
 class RPCServer : public FRT_Invokable
 {
 private:
diff --git a/fnet/src/examples/ping/pingclient.cpp b/fnet/src/examples/ping/pingclient.cpp
index 0b28f118685..6ed7f9a527c 100644
--- a/fnet/src/examples/ping/pingclient.cpp
+++ b/fnet/src/examples/ping/pingclient.cpp
@@ -4,6 +4,9 @@
 #include <examples/ping/packets.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("pingclient");
+
 class PingClient : public FastOS_Application
 {
 public:
diff --git a/fnet/src/examples/ping/pingserver.cpp b/fnet/src/examples/ping/pingserver.cpp
index 3c76bc951ec..52f55c35085 100644
--- a/fnet/src/examples/ping/pingserver.cpp
+++ b/fnet/src/examples/ping/pingserver.cpp
@@ -4,6 +4,9 @@
 #include <examples/ping/packets.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("pingserver");
+
 class PingServer : public FNET_IServerAdapter,
                    public FNET_IPacketHandler,
                    public FastOS_Application
diff --git a/fnet/src/examples/timeout/timeout.cpp b/fnet/src/examples/timeout/timeout.cpp
index 7edfbe4fb1c..af52f8b9853 100644
--- a/fnet/src/examples/timeout/timeout.cpp
+++ b/fnet/src/examples/timeout/timeout.cpp
@@ -3,6 +3,9 @@
 #include <vespa/fnet/fnet.h>
 #include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("timeout");
+
 class Timeout : public FNET_Task
 {
 private:
diff --git a/fnet/src/tests/locking/drainpackets.cpp b/fnet/src/tests/locking/drainpackets.cpp
index b453793843f..5bb72a1a85d 100644
--- a/fnet/src/tests/locking/drainpackets.cpp
+++ b/fnet/src/tests/locking/drainpackets.cpp
@@ -5,7 +5,7 @@
 class MyPacket : public FNET_Packet
 {
 public:
-  uint32_t GetPCODE() override  { return 0; }
+  uint32_t  GetPCODE() override { return 0; }
   uint32_t GetLength() override { return 0; }
   void Encode(FNET_DataBuffer *) override {}
   bool Decode(FNET_DataBuffer *, uint32_t) override { return true; }