Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/search/backendsearch.py b/search/backendsearch.py
index 91a00dc..f0fbbbe 100644
--- a/search/backendsearch.py
+++ b/search/backendsearch.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""A servlet that implements the backend of issues search.
@@ -31,7 +30,7 @@
from tracker import tracker_constants
-class BackendSearch(jsonfeed.FlaskInternalTask):
+class BackendSearch(jsonfeed.InternalTask):
"""JSON servlet for issue search in a GAE backend."""
CHECK_SAME_APP = True
@@ -65,7 +64,7 @@
int(1000 * (time.time() - start)))
if pipeline.error:
- error_message = pipeline.error.message
+ error_message = str(pipeline.error)
else:
error_message = None