Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Write into log file from ddbb_client #23

Open
wants to merge 1 commit into
base: ros-devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 10 additions & 46 deletions src/rcomponent/log_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class LogClient:
"""
Class to interact with a logs server
"""
def __init__(self, component, log_file, service_timeout=20):
def __init__(self, component, service_timeout=20):

# Service client
self.service_ns = rospy.get_param("add_log_service_namespace", 'ddbb_client/logger/insert')
Expand All @@ -73,64 +73,38 @@ def __init__(self, component, log_file, service_timeout=20):
self.log_history = dict()
self.throttle_timer = None
self.throttle_identical_timer = None

# Create file to store logs in case the service is unavailable
self._log_file = log_file

try:
open(self._log_file, 'a').close()
except FileNotFoundError as exception:
rospy.logerr("%s::LogClient:__init__: Unable to create the log file: %s" % (component, exception))

# Check if service is available (checks periodically if service is available)
# self.check_service_available()

# Normal Log Messages

def logdebug(self, description, tag, verbose=False):
query = self.__build_base_query(description, tag)
query.log_level = Logger.LOG_LEVEL_DEBUG
self.__stdout_log(query)
try:
self.__send_request(query, verbose)
except Exception as err:
self.__save_into_file(query)
self.__send_request(query, verbose)

def loginfo(self, description, tag, verbose=False):
query = self.__build_base_query(description, tag)
query.log_level = Logger.LOG_LEVEL_INFO
self.__stdout_log(query)
try:
self.__send_request(query, verbose)
except Exception as err:
self.__save_into_file(query)
self.__send_request(query, verbose)

def logwarning(self, description, tag, verbose=False):
query = self.__build_base_query(description, tag)
query.log_level = Logger.LOG_LEVEL_WARNING
self.__stdout_log(query)
try:
self.__send_request(query, verbose)
except Exception as err:
self.__save_into_file(query)
self.__send_request(query, verbose)

def logerror(self, description, tag, verbose=False):
query = self.__build_base_query(description, tag)
query.log_level = Logger.LOG_LEVEL_ERROR
self.__stdout_log(query)
try:
self.__send_request(query, verbose)
except Exception as err:
self.__save_into_file(query)
self.__send_request(query, verbose)

def loguser(self, description, tag, verbose=False):
query = self.__build_base_query(description, tag)
query.log_level = Logger.LOG_LEVEL_USER
self.__stdout_log(query)
try:
self.__send_request(query, verbose)
except Exception as err:
self.__save_into_file(query)
self.__send_request(query, verbose)

# Throttle Log Messages

Expand Down Expand Up @@ -264,21 +238,11 @@ def __send_request(self, query, verbose):
request.query = query
try:
self.client.call(request)
except Exception as err:
# self.check_service_available()
raise err

if verbose == True:
print(f"{self.robot_id}::LogClient::__send_request: Log '{query.description}' correctly added", 'VERBOSE')
if verbose == True:
rospy.loginfo(f"{self.robot_id}::LogClient::__send_request: Log '{query.description}' correctly added", 'VERBOSE')

def __save_into_file(self, query):
try:
# Open the file, and store the log
with open(self._log_file, "a") as file:
log_msg = f'[{query.log_level:<7}] [{query.date_time}] [{query.robot_id}] [{query.component}] [{query.tag}] {query.description}\n'
file.write(log_msg)
except FileNotFoundError as exception:
rospy.logerr("%s::LogClient:__save_into_file: Unable to write into log file: %s" % (self.component, exception))
except Exception as err:
rospy.logerr(f'An Exception was raised while calling the {self.service_ns} service: {err}')


# def check_service_available(self):
Expand Down
4 changes: 1 addition & 3 deletions src/rcomponent/rcomponent.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def __init__(self):

def initialize_logger(self):
# Initialize logging client
self.log_cli = LogClient(self._node_name, self._log_file)
self.log_cli = LogClient(self._node_name)
return self.log_cli


Expand All @@ -110,8 +110,6 @@ def ros_read_params(self):
(self._node_name, self._desired_freq, DEFAULT_FREQ))
self._desired_freq = DEFAULT_FREQ

self._log_file = rospy.get_param('~log_file', default=os.path.join(os.getenv('HOME', '/default/fallback/path'), 'log_file.txt'))

def setup(self):
'''
Initializes de hand
Expand Down