From 808f9f02d29b28d956b665d634a5c5b052ff7a60 Mon Sep 17 00:00:00 2001 From: Winson Chan Date: Thu, 19 Feb 2015 06:17:07 +0000 Subject: [PATCH] Remove eventlet monkey patch in mistral __init__ Eventlet monkey patch in mistral/__init__.py leads to "unable to switch thread" error when hosting the mistral API under apache. Change-Id: Ib1fa4c2522a4afa0635cc9fee9fac02e610414de --- mistral/__init__.py | 25 ------------------------- mistral/tests/__init__.py | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mistral/__init__.py b/mistral/__init__.py index 4c7803c6b..e69de29bb 100644 --- a/mistral/__init__.py +++ b/mistral/__init__.py @@ -1,25 +0,0 @@ -# Copyright 2015 - Mirantis, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import eventlet -import sys - - -eventlet.monkey_patch( - os=True, - select=True, - socket=True, - thread=False if '--use-debugger' in sys.argv else True, - time=True -) diff --git a/mistral/tests/__init__.py b/mistral/tests/__init__.py index e69de29bb..4c7803c6b 100644 --- a/mistral/tests/__init__.py +++ b/mistral/tests/__init__.py @@ -0,0 +1,25 @@ +# Copyright 2015 - Mirantis, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import eventlet +import sys + + +eventlet.monkey_patch( + os=True, + select=True, + socket=True, + thread=False if '--use-debugger' in sys.argv else True, + time=True +)