Skip to content

Thread safety fixes #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edenhill merged 4 commits into from
Aug 8, 2016
Merged

Thread safety fixes #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e92ae7c
Added CallState to track per-thread C call state (fixes #19)
edenhill Aug 8, 2016
631eb9b
Handle None error_cb and dr_cb
edenhill Aug 8, 2016
ff1d39d
More gitignores
edenhill Aug 8, 2016
20bba1c
Review cleanups: Py2 support, PEP8 clean
edenhill Aug 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Handle None error_cb and dr_cb
  • Loading branch information
@edenhill
edenhill committed Aug 8, 2016
commit 631eb9b9469655488dbe7e5c5680a15e18387435
4 changes: 2 additions & 2 deletions confluent_kafka/src/Producer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,9 @@ static PyObject *Producer_produce (Handle *self, PyObject *args,
return NULL;
}

if (!dr_cb)
if (!dr_cb || dr_cb == Py_None)
dr_cb = self->u.Producer.default_dr_cb;
if (!partitioner_cb)
if (!partitioner_cb || partitioner_cb == Py_None)
partitioner_cb = self->u.Producer.partitioner_cb;

/* Create msgstate if necessary, may return NULL if no callbacks
Expand Down
10 changes: 7 additions & 3 deletions confluent_kafka/src/confluent_kafka.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,10 +1113,14 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
continue;

} else if (!strcmp(k, "error_cb")) {
if (h->error_cb)
if (h->error_cb) {
Py_DECREF(h->error_cb);
h->error_cb = vo;
Py_INCREF(h->error_cb);
h->error_cb = NULL;
}
if (vo != Py_None) {
h->error_cb = vo;
Py_INCREF(h->error_cb);
}
Py_DECREF(ks);
continue;
}
Expand Down