Skip to content

Commit 3915493

Browse files
committed
Revert "test"
This reverts commit 4142767.
1 parent 4142767 commit 3915493

File tree

5 files changed

+8
-77
lines changed

5 files changed

+8
-77
lines changed

azure_functions_worker/bindings/meta.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
def _check_http_input_type_annotation(bind_name: str, pytype: type) -> bool:
2323
if sys.version_info.minor >= BASE_EXT_SUPPORTED_PY_MINOR_VERSION and \
2424
is_envvar_true(PYTHON_ENABLE_INIT_INDEXING):
25-
import azurefunctions.extension.base as ext_base
25+
import azure.functions.extension.base as ext_base
2626
if ext_base.HttpV2FeatureChecker.http_v2_enabled():
2727
return ext_base.RequestTrackerMeta.check_type(pytype)
2828

@@ -33,7 +33,7 @@ def _check_http_input_type_annotation(bind_name: str, pytype: type) -> bool:
3333
def _check_http_output_type_annotation(bind_name: str, pytype: type) -> bool:
3434
if sys.version_info.minor >= BASE_EXT_SUPPORTED_PY_MINOR_VERSION and \
3535
is_envvar_true(PYTHON_ENABLE_INIT_INDEXING):
36-
import azurefunctions.extension.base as ext_base
36+
import azure.functions.extension.base as ext_base
3737
if ext_base.HttpV2FeatureChecker.http_v2_enabled():
3838
return ext_base.ResponseTrackerMeta.check_type(pytype)
3939

azure_functions_worker/dispatcher.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ async def _handle__worker_init_request(self, request):
316316

317317
if sys.version_info.minor >= BASE_EXT_SUPPORTED_PY_MINOR_VERSION \
318318
and self._has_http_func:
319-
from azurefunctions.extension.base \
319+
from azure.functions.extension.base \
320320
import HttpV2FeatureChecker
321321

322322
if HttpV2FeatureChecker.http_v2_enabled():
@@ -482,7 +482,6 @@ async def _handle__function_load_request(self, request):
482482
status=protos.StatusResult.Success)))
483483

484484
except Exception as ex:
485-
logger.warning("VICTORIA Error: {}", ex)
486485
return protos.StreamingMessage(
487486
request_id=self.request_id,
488487
function_load_response=protos.FunctionLoadResponse(
@@ -544,14 +543,14 @@ async def _handle__invocation_request(self, request):
544543
BASE_EXT_SUPPORTED_PY_MINOR_VERSION \
545544
and fi.trigger_metadata is not None \
546545
and fi.trigger_metadata.get('type') == HTTP_TRIGGER:
547-
from azurefunctions.extension.base import HttpV2FeatureChecker
546+
from azure.functions.extension.base import HttpV2FeatureChecker
548547
http_v2_enabled = HttpV2FeatureChecker.http_v2_enabled()
549548

550549
if http_v2_enabled:
551550
http_request = await http_coordinator.get_http_request_async(
552551
invocation_id)
553552

554-
from azurefunctions.extension.base import RequestTrackerMeta
553+
from azure.functions.extension.base import RequestTrackerMeta
555554
route_params = {key: item.string for key, item
556555
in trigger_metadata.items() if key not in [
557556
'Headers', 'Query']}
@@ -704,7 +703,7 @@ async def _handle__function_environment_reload_request(self, request):
704703
if sys.version_info.minor >= \
705704
BASE_EXT_SUPPORTED_PY_MINOR_VERSION and \
706705
self._has_http_func:
707-
from azurefunctions.extension.base \
706+
from azure.functions.extension.base \
708707
import HttpV2FeatureChecker
709708

710709
if HttpV2FeatureChecker.http_v2_enabled():

azure_functions_worker/http_v2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def get_unused_tcp_port():
165165

166166

167167
def initialize_http_server():
168-
from azurefunctions.extension.base \
168+
from azure.functions.extension.base \
169169
import ModuleTrackerMeta, RequestTrackerMeta
170170

171171
web_extension_mod_name = ModuleTrackerMeta.get_module()

azure_functions_worker/logging.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
SDK_LOG_PREFIX = "azure.functions"
1414
SYSTEM_ERROR_LOG_PREFIX = "azure_functions_worker_errors"
1515

16-
local_handler = logging.FileHandler("C:\\Users\\victoriahall\\Documents\\repos\\azure-functions-python-worker\\mylog.txt")
16+
1717
logger: logging.Logger = logging.getLogger(SYSTEM_LOG_PREFIX)
1818
error_logger: logging.Logger = (
1919
logging.getLogger(SYSTEM_ERROR_LOG_PREFIX))
@@ -78,8 +78,6 @@ def setup(log_level, log_destination):
7878
error_logger.addHandler(error_handler)
7979
error_logger.setLevel(getattr(logging, log_level))
8080

81-
logger.addHandler(local_handler)
82-
8381

8482
def disable_console_logging() -> None:
8583
# We should only remove the sys.stdout stream, as error_logger is used for

mylog.txt

-66
This file was deleted.

0 commit comments

Comments
 (0)