Merge pull request #42 from 5G-ERA/klepo

feat: fixed logging in server
5G-ERA · Feb 29, 2024 · cad6f1a · cad6f1a
2 parents f4b329c + c91fc7a
commit cad6f1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/era_5g_relay_network_application/client.py b/era_5g_relay_network_application/client.py
@@ -226,7 +226,6 @@ def main(args=None) -> None:
 
     node.get_logger().debug(f"Loaded outgoing topics: {topics_outgoing_list}")
     node.get_logger().debug(f"Loaded incoming topics: {topics_incoming_list}")
-
     node.get_logger().debug(f"Loaded outgoing services: {services}")
 
     global client

diff --git a/era_5g_relay_network_application/server.py b/era_5g_relay_network_application/server.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import sys
 import threading
 from functools import partial
 from multiprocessing import Queue
@@ -33,6 +34,9 @@
 from era_5g_relay_network_application.worker_tf import WorkerTF
 from era_5g_server.server import NetworkApplicationServer
 
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
+logger = logging.getLogger("relay server python")
+
 # port of the netapp's server
 NETAPP_PORT = int(os.getenv("NETAPP_PORT", 5896))
 

diff --git a/set_env_client.sh b/set_env_client.sh
@@ -16,8 +16,8 @@ export NETAPP_ADDRESS=http://127.0.0.1:5897
 #export NETAPP_ADDRESS=http://192.168.206.50:5897
 
 # Set environment variables (input, images)
-export TOPICS_TO_SERVER='[{"name":"/image_raw","type":"sensor_msgs/Image"}]'
-export TOPICS_FROM_SERVER='[{"name":"/res","type":"std_msgs/String"}]'
+export TOPICS_TO_SERVER='[{"name":"/image_raw", "type":"sensor_msgs/Image", "compression": "hevc"}]'
+export TOPICS_FROM_SERVER='[{"name":"/res", "type":"std_msgs/String"}]'
 #export SERVICES_TO_SERVER='[{"name":"/fcw_service_node/set_parameters_atomically",
 # "type":"rcl_interfaces/srv/SetParametersAtomically"}]'
 export EXTENDED_MEASURING=True

diff --git a/set_env_server.sh b/set_env_server.sh
@@ -14,8 +14,8 @@ export ROS_DOMAIN_ID=1
 export NETAPP_PORT=5897
 
 # Set environment variables (results, string)
-export TOPICS_TO_CLIENT='[{"name":"/res","type":"std_msgs/String"}]'
-export TOPICS_FROM_CLIENT='[{"name":"/image_raw","type":"sensor_msgs/Image"}]'
+export TOPICS_TO_CLIENT='[{"name":"/res", "type":"std_msgs/String"}]'
+export TOPICS_FROM_CLIENT='[{"name":"/image_raw", "type":"sensor_msgs/Image", "compression": "hevc"}]'
 #export SERVICES_FROM_CLIENT='[{"name":"/fcw_service_node/set_parameters_atomically",
 # "type":"rcl_interfaces/srv/SetParametersAtomically"}]'
 export EXTENDED_MEASURING=True