From 022bbac5d95a222a61be95c094c8f91d8cc4b996 Mon Sep 17 00:00:00 2001 From: Bill Prin Date: Thu, 9 Jun 2016 11:14:52 -0700 Subject: [PATCH] Fix logger list_entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit logName in the v2 API expects the fully qualified name. The colon operator is also slower than the equal operator (no indexing) and currently isn’t working anyway (API bug). --- gcloud/logging/logger.py | 2 +- gcloud/logging/test_logger.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gcloud/logging/logger.py b/gcloud/logging/logger.py index 913e32eb07a79..ad2d4b70ca771 100644 --- a/gcloud/logging/logger.py +++ b/gcloud/logging/logger.py @@ -298,7 +298,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None, more entries can be retrieved with another call (pass that value as ``page_token``). """ - log_filter = 'logName:%s' % (self.name,) + log_filter = 'logName=%s' % (self.full_name,) if filter_ is not None: filter_ = '%s AND %s' % (filter_, log_filter) else: diff --git a/gcloud/logging/test_logger.py b/gcloud/logging/test_logger.py index 1ddcbaa4f6f3c..fd7938f65b26f 100644 --- a/gcloud/logging/test_logger.py +++ b/gcloud/logging/test_logger.py @@ -348,7 +348,8 @@ def test_delete_w_alternate_client(self): def test_list_entries_defaults(self): LISTED = { 'projects': None, - 'filter_': 'logName:%s' % (self.LOGGER_NAME), + 'filter_': 'logName=projects/%s/logs/%s' % + (self.PROJECT, self.LOGGER_NAME), 'order_by': None, 'page_size': None, 'page_token': None, @@ -371,7 +372,8 @@ def test_list_entries_explicit(self): PAGE_SIZE = 42 LISTED = { 'projects': ['PROJECT1', 'PROJECT2'], - 'filter_': '%s AND logName:%s' % (FILTER, self.LOGGER_NAME), + 'filter_': '%s AND logName=projects/%s/logs/%s' % + (FILTER, self.PROJECT, self.LOGGER_NAME), 'order_by': DESCENDING, 'page_size': PAGE_SIZE, 'page_token': TOKEN,