Update test and logging

diff --git a/itest/tee_server.py b/itest/tee_server.py
index 1989b5fa8059624b22fd3db41f049f43b0eef002..77d95e3be7cc424aef613ef326dc73422cdfb423 100755 (executable)
--- a/itest/tee_server.py
+++ b/itest/tee_server.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import struct
 import argparse
 import asyncio
 import qpack
@@ -12,7 +13,9 @@ class TeeServerProtocol(asyncio.Protocol):
 
     def data_received(self, data):
         print('Data received: {}'.format(len(data)))
-        self.transport.write(b'test')
+        header = struct.unpack_from('<LHBB', data)
+        print(header)
+        # self.transport.write(b'test')
 
 
 async def main(args):
@@ -20,7 +23,7 @@ async def main(args):
 
     server = await loop.create_server(
         lambda: TeeServerProtocol(),
-        '127.0.0.1',
+        '0.0.0.0',
         args.port)
 
     async with server:
@@ -28,13 +31,9 @@ async def main(args):
 
 
 if __name__ == '__main__':
-
     parser = argparse.ArgumentParser()
-
     parser.add_argument("-p", "--port", type=int, default=9104)
-
     args = parser.parse_args()
 
     loop = asyncio.get_event_loop()
-
     loop.run_until_complete(main(args))

diff --git a/src/siri/db/tee.c b/src/siri/db/tee.c
index c10ecc8b552c5966c8592ef39db0e9a2d7ec4a82..45718db9625b3f56bf129ed9568127e6c6e82b0c 100644 (file)
--- a/src/siri/db/tee.c
+++ b/src/siri/db/tee.c
@@ -12,6 +12,8 @@
 
 #define TEE__BUF_SZ 512
 static char tee__buf[TEE__BUF_SZ];
+static char tee__address[SIRI_CFG_MAX_LEN_ADDRESS+7];
+
 
 static void tee__alloc_buffer(
     uv_handle_t * handle __attribute__((unused)),
@@ -48,8 +50,9 @@ static void tee__on_data(
     {
         if (nread != UV_EOF)
         {
-            log_error("Read error on tee '%s': '%s'",
+            log_error("Read error on tee '%s:%u': '%s'",
                 tee->address,
+                tee->port,
                 uv_err_name(nread));
         }
 
@@ -60,9 +63,10 @@ static void tee__on_data(
         return;
     }
 
-    log_debug("Got %zd bytes on tee `%s` which will be ignored",
+    log_debug("Got %zd bytes on tee `%s:%u` which will be ignored",
             nread,
-            tee->address);
+            tee->address,
+            tee->port);
 }
 
 static void tee__do_write(siridb_tee_t * tee, sirinet_pkg_t * pkg)
@@ -126,8 +130,9 @@ static void tee__on_connect(uv_connect_t * req, int status)
     /* failed */
     tee->err_code = SIRIDB_TEE_E_CONNECT;
     log_warning(
-            "Cannot connect to tee '%s' (%s)",
+            "Cannot connect to tee '%s:%u' (%s)",
             tee->address,
+            tee->port,
             uv_strerror(status));
 
 fail:
@@ -319,7 +324,8 @@ const char * siridb_tee_str(siridb_tee_t * tee)
     }
     if (tee->address)
     {
-        return tee->address;
+        (void) sprintf(tee__address, "%s:%u", tee->address, tee->port);
+        return tee__address;
     }
     return "disabled";
 }