diff --git a/SAS/MoM/MoMQueryService/momqueryrpc.py b/SAS/MoM/MoMQueryService/momqueryrpc.py index a92ba1218021daa22b2ce975b08c738691208bd1..ce0bf9e492d3671bfa6aaef2249e365483412742 100644 --- a/SAS/MoM/MoMQueryService/momqueryrpc.py +++ b/SAS/MoM/MoMQueryService/momqueryrpc.py @@ -55,9 +55,9 @@ class MoMQueryRPC(RPCWrapper): :param folder: :return: Boolean """ - logger.info("Requesting project: %s exists" % folder) + logger.info("Requesting project: %s exists", folder) result = self.rpc('FolderExists', folder=folder) - logger.info("Received Project exists: %s" % result) + logger.info("Received Project exists: %s", result) return result def isProjectActive(self, project_name): @@ -65,9 +65,9 @@ class MoMQueryRPC(RPCWrapper): :param project_name: :return: Boolean """ - logger.info("Requesting if project: %s is active" % project_name) + logger.info("Requesting if project: %s is active", project_name) result = self.rpc('IsProjectActive', project_name=project_name) - logger.info("Received Project is active: %s" % result) + logger.info("Received Project is active: %s", result) return result def getProjectDetails(self, ids): @@ -79,9 +79,9 @@ class MoMQueryRPC(RPCWrapper): ids = [str(x) for x in ids] ids_string = ', '.join(ids) - logger.info("Requesting details for mom objects: %s" % (str(ids_string))) + logger.info("Requesting details for mom objects: %s", (str(ids_string))) result = self.rpc('GetProjectDetails', mom_ids=ids_string) - logger.info("Received details for %s mom objects" % (len(result))) + logger.info("Received details for %s mom objects", (len(result))) return result def getProjects(self): @@ -92,7 +92,7 @@ class MoMQueryRPC(RPCWrapper): for project in projects: project['statustime'] = project['statustime'].datetime() - logger.info("Received %s projects" % (len(projects))) + logger.info("Received %s projects", (len(projects))) return projects def getProject(self, project_mom2id): diff --git a/SAS/MoM/MoMQueryService/momqueryservice.py b/SAS/MoM/MoMQueryService/momqueryservice.py index 1c979c967112ebb66bd7238f24be12df3cb3efd9..d598a2774896df9d9d53934d8ae4abdd52ec177a 100755 --- a/SAS/MoM/MoMQueryService/momqueryservice.py +++ b/SAS/MoM/MoMQueryService/momqueryservice.py @@ -85,9 +85,9 @@ class MoMDatabaseWrapper: connect_options = self.dbcreds.mysql_connect_options() connect_options['connection_timeout'] = 5 try: - logger.info("Connecting to %s" % self.dbcreds.stringWithHiddenPassword()) + logger.info("Connecting to %s", self.dbcreds.stringWithHiddenPassword()) self.conn = connector.connect(**connect_options) - logger.debug("Connected to %s" % self.dbcreds.stringWithHiddenPassword()) + logger.debug("Connected to %s", self.dbcreds.stringWithHiddenPassword()) except Exception as e: logger.error(str(e)) self.conn = None @@ -271,7 +271,7 @@ project.name='%(project_name)s'""" % { :param project_name: :return: Boolean """ - logger.info("is_project_active for project name: %s" % project_name) + logger.info("is_project_active for project name: %s", project_name) query = """SELECT 1 FROM mom2object as project @@ -298,7 +298,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_ids) - logger.info("getProjectDetails for mom ids: %s" % ids_str) + logger.info("getProjectDetails for mom ids: %s", ids_str) # TODO: make a view for this query in momdb! query = '''SELECT project.mom2id as project_mom2id, project.id as project_mom2objectid, project.name as project_name, project.description as project_description, @@ -316,8 +316,7 @@ project.name='%(project_name)s'""" % { ''' % (ids_str,) rows = self._executeQuery(query) - logger.info("Found %d results for mom id(s): %s" % - (len(rows) if rows else 0, ids_str)) + logger.info("Found %d results for mom id(s): %s", (len(rows) if rows else 0, ids_str)) result = {} for row in rows: @@ -346,7 +345,7 @@ project.name='%(project_name)s'""" % { ''' result = self._executeQuery(query) - logger.info("Found %d projects" % (len(result), )) + logger.info("Found %d projects", (len(result), )) return result @@ -377,7 +376,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(project_mom2id) - logger.info("getProjectTaskIds for project_mom2id: %s" % ids_str) + logger.info("getProjectTaskIds for project_mom2id: %s", ids_str) query = '''SELECT tasks.mom2id FROM mom2object tasks inner join mom2object project on project.id = tasks.ownerprojectid @@ -398,7 +397,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_ids) - logger.info("getPredecessorIds for mom ids: %s" % ids_str) + logger.info("getPredecessorIds for mom ids: %s", ids_str) query = '''SELECT mom2id, predecessor FROM mom2object @@ -429,7 +428,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_ids) - logger.info("getSuccessorIds for mom ids: %s" % ids_str) + logger.info("getSuccessorIds for mom ids: %s", ids_str) condition = ' OR '.join(['predecessor LIKE \'%%M%s%%\'' % x for x in ids_str.split(',')]) @@ -463,7 +462,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_group_ids) - logger.info("getTaskIdsInGroup for mom group ids: %s" % ids_str) + logger.info("getTaskIdsInGroup for mom group ids: %s", ids_str) query = '''SELECT mom2id, group_id FROM mom2object where group_id in (%s) @@ -490,7 +489,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_parent_group_ids) - logger.debug("getGroupsInParentGroup for mom parent group ids: %s" % ids_str) + logger.debug("getGroupsInParentGroup for mom parent group ids: %s", ids_str) query = '''SELECT parent.id as parent_mom2object_id, parent.mom2id as parent_mom2id, grp.mom2id as group_mom2id, grp.id as group_mom2object_id, grp.name as group_name, grp.description as group_description @@ -519,7 +518,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_parent_group_ids) - logger.debug("getTaskIdsInParentGroup for mom parent group ids: %s" % ids_str) + logger.debug("getTaskIdsInParentGroup for mom parent group ids: %s", ids_str) groups_result = self.getGroupsInParentGroup(ids_str) @@ -543,7 +542,7 @@ project.name='%(project_name)s'""" % { ids_str = _toIdsString(mom_ids) - logger.info("getDataProducts for mom ids: %s" % ids_str) + logger.info("getDataProducts for mom ids: %s", ids_str) query = '''SELECT mo.id as momobject_id, mo.mom2id as mom2id, dp.id, dp.name, dp.exported, dp.status, dp.fileformat FROM mom2object mo @@ -680,7 +679,7 @@ def main(): dbcreds = dbcredentials.parse_options(options) - logger.info("Using dbcreds: %s" % dbcreds.stringWithHiddenPassword()) + logger.info("Using dbcreds: %s", dbcreds.stringWithHiddenPassword()) # start the service and listen. with createService(busname=options.busname, diff --git a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py index 67e2ce29e119b1b4dad776d2935105a5508fd427..2e9c8ad12d57b9bf2bfcd231c92b3ba0f8a056e1 100755 --- a/SAS/MoM/MoMQueryService/test/test_momqueryservice.py +++ b/SAS/MoM/MoMQueryService/test/test_momqueryservice.py @@ -224,7 +224,7 @@ class TestMomQueryRPC(unittest.TestCase): self.momrpc.folderExists(self.folder) - self.logger_mock.info.assert_any_call("Requesting project: %s exists" % self.folder) + self.logger_mock.info.assert_any_call("Requesting project: %s exists", self.folder) @mock.patch('lofar.messaging.messagebus.qpid.messaging') def test_is_project_logs_after_query(self, qpid_mock): @@ -236,7 +236,7 @@ class TestMomQueryRPC(unittest.TestCase): result = self.momrpc.folderExists(self.folder) - self.logger_mock.info.assert_any_call("Received Project exists: %s" % result) + self.logger_mock.info.assert_any_call("Received Project exists: %s", result) @mock.patch('lofar.messaging.messagebus.qpid.messaging') def test_authorized_add_with_status_logs_before_query(self, qpid_mock): @@ -344,7 +344,7 @@ class TestMoMDatabaseWrapper(unittest.TestCase): def test_is_project_active_logs_start_of_query(self): self.mom_database_wrapper.is_project_active(self.project_name) - self.logger_mock.info.assert_any_call("is_project_active for project name: %s" % self.project_name) + self.logger_mock.info.assert_any_call("is_project_active for project name: %s", self.project_name) def test_is_project_active_logs_end_of_query(self): is_active = False