mirrors
/
kore
mirror of https://git.kore.io/kore.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

small python improvements. 

- Check for an exception when in a timer context and log it if uncaught.
- Make sure tlsverify is settable regardless of client certs being specified.
This commit is contained in:
Joris Vink 2019-05-16 21:07:42 +02:00
parent 41366ba583
commit b4aba48fad
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python.c
View File

@ -1675,6 +1675,8 @@ pytimer_run(void *arg, u_int64_t now)
ret = PyObject_CallObject(timer->callable, NULL);
Py_XDECREF(ret);
kore_python_log_error("pytimer_run");
if (timer->flags & KORE_TIMER_ONESHOT) {
timer->run = NULL;
Py_DECREF((PyObject *)timer);
@ -4238,13 +4240,11 @@ pyhttp_client_request(struct pyhttp_client *client, int m, PyObject *kwargs)
client->tlscert);
curl_easy_setopt(op->curl.handle, CURLOPT_SSLKEY,
client->tlskey);
}
if (client->tlsverify == 0) {
curl_easy_setopt(op->curl.handle,
CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt(op->curl.handle,
CURLOPT_SSL_VERIFYPEER, 0);
}
if (client->tlsverify == 0) {
curl_easy_setopt(op->curl.handle, CURLOPT_SSL_VERIFYHOST, 0);
curl_easy_setopt(op->curl.handle, CURLOPT_SSL_VERIFYPEER, 0);
}
if (client->cabundle != NULL) {