Skip to content

Commit 2584495

Browse files
bretambrosegraebm
andauthored
Update to new default resolver creation function (#209)
* Update to new default resolver creation function * latest aws-c-event-stream for deadlock fix Co-authored-by: Michael Graeb <graebm@amazon.com>
1 parent 15b7024 commit 2584495

File tree

9 files changed

+13
-9
lines changed

9 files changed

+13
-9
lines changed

crt/aws-c-common

Submodule aws-c-common updated 275 files

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ def __init__(self, name, extra_cmake_args=[]):
150150
if sys.platform != 'darwin' and sys.platform != 'win32':
151151
AWS_LIBS.append(AwsLib('s2n'))
152152
AWS_LIBS.append(AwsLib('aws-c-common'))
153-
AWS_LIBS.append(AwsLib('aws-c-io'))
154153
AWS_LIBS.append(AwsLib('aws-c-cal'))
154+
AWS_LIBS.append(AwsLib('aws-c-io'))
155155
AWS_LIBS.append(AwsLib('aws-checksums'))
156156
AWS_LIBS.append(AwsLib('aws-c-compression'))
157157
AWS_LIBS.append(AwsLib('aws-c-event-stream'))

source/io.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,12 @@ PyObject *aws_py_host_resolver_new_default(PyObject *self, PyObject *args) {
222222
}
223223

224224
/* From hereon, we need to clean up if errors occur */
225+
struct aws_host_resolver_default_options resolver_options = {
226+
.max_entries = max_hosts,
227+
.el_group = elg,
228+
};
225229

226-
host_resolver->native = aws_host_resolver_new_default(allocator, max_hosts, elg, NULL);
230+
host_resolver->native = aws_host_resolver_new_default(allocator, &resolver_options);
227231
if (host_resolver->native == NULL) {
228232
PyErr_SetAwsLastError();
229233
goto resolver_init_failed;

0 commit comments

Comments
 (0)