Intercept and set debug context before interceptor

rnpridgeon · edenhill · commit b4a4d9a3abfc · 2018-10-19T12:07:10.000-07:00
diff --git a/confluent_kafka/src/confluent_kafka.c b/confluent_kafka/src/confluent_kafka.c
@@ -1506,7 +1506,6 @@ static int common_conf_set_special(PyObject *confdict, rd_kafka_conf_t *conf,
             != RD_KAFKA_CONF_OK) {
                 cfl_PyErr_Format(RD_KAFKA_RESP_ERR__INVALID_ARG,
                                  "%s", errstr);
-
                 Py_DECREF(vs);
                 Py_XDECREF(vs8);
                 return 0;
@@ -1585,8 +1584,8 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
         /*
          * Set debug contexts first to capture all events including plugin loading
          */
-         if ((vo = PyDict_GetItemString(confdict, "debug")))
-                if (!common_conf_set_special(confdict, conf, "debug", vo))
+         if ((vo = PyDict_GetItemString(confdict, "debug")) &&
+              !common_conf_set_special(confdict, conf, "debug", vo))
                         goto outer_err;
 
         /*
@@ -1598,40 +1597,18 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
          * correct order.
          */
         if ((vo = PyDict_GetItemString(confdict, "plugin.library.paths"))) {
-                const char *v;
-                char errstr[256];
+                /* Resolve plugin paths */
                 PyObject *resolved;
-                PyObject *vs = NULL, *vs8 = NULL;
 
-                /* Resolve plugin paths */
                 resolved = resolve_plugins(vo);
                 if (!resolved)
                         goto outer_err;
 
-                if (!common_conf_set_special(confdict, conf, "plugin.library.paths", vo)) {
+                if (!common_conf_set_special(confdict, conf,
+                                             "plugin.library.paths",
+                                             resolved)) {
                         Py_DECREF(resolved);
-                        rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-
-                        return NULL;
-                }
-
-                Py_DECREF(resolved);
-
-                v = cfl_PyUnistr_AsUTF8(vs, &vs8);
-
-                if (rd_kafka_conf_set(conf, "plugin.library.paths", v, errstr, sizeof(errstr))
-                   != RD_KAFKA_CONF_OK) {
-                        cfl_PyErr_Format(RD_KAFKA_RESP_ERR__INVALID_ARG,
-                                "%s", errstr);
-
-                        rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-
-                        Py_XDECREF(vs8);
-                        Py_XDECREF(vs);
-
-                        return NULL;
+                        goto outer_err;
                 }
                 Py_DECREF(resolved);
         }
@@ -1643,16 +1620,15 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
                              "set default topic configuration values in the global dict");
         */
                 if (PyDict_Update(confdict, vo) == -1) {
-                        rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-                        return NULL;
+                        goto outer_err;
                 }
                 PyDict_DelItemString(confdict, "default.topic.config");
         }
 
 	/* Convert config dict to config key-value pairs. */
 	while (PyDict_Next(confdict, &pos, &ko, &vo)) {
-		PyObject *ks, *ks8;
+		PyObject *ks;
+		PyObject *ks8 = NULL;
 		PyObject *vs = NULL, *vs8 = NULL;
 		const char *k;
 		const char *v;
@@ -1663,10 +1639,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
                         PyErr_SetString(PyExc_TypeError,
                                         "expected configuration property name "
                                         "as type unicode string");
-			rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-
-			return NULL;
+                        goto inner_err;
 		}
 
 		k = cfl_PyUnistr_AsUTF8(ks, &ks8);
@@ -1675,13 +1648,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 				PyErr_SetString(PyExc_TypeError,
 						"expected error_cb property "
 						"as a callable function");
-				rd_kafka_conf_destroy(conf);
-                                Py_DECREF(confdict);
-
-                                Py_XDECREF(ks8);
-				Py_DECREF(ks);
-
-				return NULL;
+                                goto inner_err;
                         }
 			if (h->error_cb) {
 				Py_DECREF(h->error_cb);
@@ -1699,13 +1666,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
                                 PyErr_SetString(PyExc_ValueError,
                                         "expected throttle_cb property "
                                         "as a callable function");
-                                rd_kafka_conf_destroy(conf);
-                                Py_DECREF(confdict);
-
-                                Py_XDECREF(ks8);
-                                Py_DECREF(ks);
-
-                                return NULL;
+                                goto inner_err;
                         }
                         if (h->throttle_cb) {
                                 Py_DECREF(h->throttle_cb);
@@ -1723,13 +1684,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 				PyErr_SetString(PyExc_TypeError,
 						"expected stats_cb property "
 						"as a callable function");
-				rd_kafka_conf_destroy(conf);
-                                Py_DECREF(confdict);
-
-                                Py_XDECREF(ks8);
-				Py_DECREF(ks);
-
-				return NULL;
+                                goto inner_err;
                         }
 
 			if (h->stats_cb) {
@@ -1765,13 +1720,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 			r = consumer_conf_set_special(h, conf, k, vo);
 		if (r == -1) {
 			/* Error */
-                        Py_XDECREF(ks8);
-			Py_DECREF(ks);
-			rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-
-			return NULL;
-
+                        goto inner_err;
 		} else if (r == 1) {
 			/* Handled */
 			continue;
@@ -1789,13 +1738,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
                                                 "expected configuration "
                                                 "property value as type "
                                                 "unicode string");
-                                rd_kafka_conf_destroy(conf);
-                                Py_DECREF(confdict);
-
-                                Py_XDECREF(ks8);
-                                Py_DECREF(ks);
-
-                                return NULL;
+                                goto inner_err;
                         }
                         v = cfl_PyUnistr_AsUTF8(vs, &vs8);
                 }
@@ -1804,15 +1747,7 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
 		    RD_KAFKA_CONF_OK) {
 			cfl_PyErr_Format(RD_KAFKA_RESP_ERR__INVALID_ARG,
 					  "%s", errstr);
-			rd_kafka_conf_destroy(conf);
-                        Py_DECREF(confdict);
-
-                        Py_XDECREF(vs8);
-                        Py_XDECREF(vs);
-                        Py_XDECREF(ks8);
-			Py_DECREF(ks);
-
-			return NULL;
+                        goto inner_err;
 		}
 
                 Py_XDECREF(vs8);
@@ -1863,6 +1798,12 @@ rd_kafka_conf_t *common_conf_setup (rd_kafka_type_t ktype,
         h->initiated = 1;
 
 	return conf;
+
+outer_err:
+        Py_DECREF(confdict);
+        rd_kafka_conf_destroy(conf);
+
+        return NULL;
 }
 
 
