kore

a fork of the worlds most advanced web framework
Log | Files | Refs | README | LICENSE

commit 29202d7330dd646c692ed2ebf409dac5b5722d1a
parent 6080bb1c3523a5146d958a58de0fce6833ffc9db
Author: Joris Vink <joris@coders.se>
Date:   Tue, 16 Oct 2018 13:16:36 +0200

Make kore_python_log_error() public.

While here also make kore_module_load() return the
kore_module data structure pointer it just added
to the modules list.

Diffstat:
Minclude/kore/kore.h | 3++-
Minclude/kore/python_api.h | 1+
Msrc/module.c | 4+++-
Msrc/python.c | 72++++++++++++++++++++++++++++++++++++------------------------------------
4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/include/kore/kore.h b/include/kore/kore.h @@ -714,7 +714,6 @@ void kore_domain_closelogs(void); void *kore_module_getsym(const char *, struct kore_runtime **); void kore_domain_load_crl(void); void kore_domain_keymgr_init(void); -void kore_module_load(const char *, const char *, int); void kore_domain_callback(void (*cb)(struct kore_domain *)); void kore_domain_tlsinit(struct kore_domain *, const void *, size_t); #if !defined(KORE_NO_HTTP) @@ -726,6 +725,8 @@ struct kore_module_handle *kore_module_handler_find(const char *, #endif struct kore_runtime_call *kore_runtime_getcall(const char *); +struct kore_module *kore_module_load(const char *, + const char *, int); void kore_runtime_execute(struct kore_runtime_call *); int kore_runtime_onload(struct kore_runtime_call *, int); diff --git a/include/kore/python_api.h b/include/kore/python_api.h @@ -28,6 +28,7 @@ void kore_python_cleanup(void); void kore_python_coro_run(void); void kore_python_path(const char *); void kore_python_coro_delete(void *); +void kore_python_log_error(const char *); PyObject *kore_python_callable(PyObject *, const char *); diff --git a/src/module.c b/src/module.c @@ -60,7 +60,7 @@ kore_module_cleanup(void) } } -void +struct kore_module * kore_module_load(const char *path, const char *onload, int type) { struct stat st; @@ -114,6 +114,8 @@ kore_module_load(const char *path, const char *onload, int type) module->path, onload); } } + + return (module); } void diff --git a/src/python.c b/src/python.c @@ -43,7 +43,6 @@ struct python_coro { static PyMODINIT_FUNC python_module_init(void); static PyObject *python_import(const char *); -static void python_log_error(const char *); static PyObject *pyconnection_alloc(struct connection *); static PyObject *python_callable(PyObject *, const char *); @@ -227,32 +226,9 @@ kore_python_coro_delete(void *obj) kore_pool_put(&coro_pool, coro); } -static void * -python_malloc(void *ctx, size_t len) -{ - return (kore_malloc(len)); -} - -static void * -python_calloc(void *ctx, size_t memb, size_t len) -{ - return (kore_calloc(memb, len)); -} - -static void * -python_realloc(void *ctx, void *ptr, size_t len) -{ - return (kore_realloc(ptr, len)); -} - -static void -python_free(void *ctx, void *ptr) -{ - kore_free(ptr); -} - -static void -python_log_error(const char *function) +/* XXX - Fix this (show error type + traceback. */ +void +kore_python_log_error(const char *function) { PyObject *type, *value, *traceback; @@ -278,6 +254,30 @@ python_log_error(const char *function) Py_DECREF(traceback); } +static void * +python_malloc(void *ctx, size_t len) +{ + return (kore_malloc(len)); +} + +static void * +python_calloc(void *ctx, size_t memb, size_t len) +{ + return (kore_calloc(memb, len)); +} + +static void * +python_realloc(void *ctx, void *ptr, size_t len) +{ + return (kore_realloc(ptr, len)); +} + +static void +python_free(void *ctx, void *ptr) +{ + kore_free(ptr); +} + static void python_module_free(struct kore_module *module) { @@ -293,7 +293,7 @@ python_module_reload(struct kore_module *module) PyErr_Clear(); if ((handle = PyImport_ReloadModule(module->handle)) == NULL) { - python_log_error("python_module_reload"); + kore_python_log_error("python_module_reload"); return; } @@ -357,7 +357,7 @@ python_coro_run(struct python_coro *coro) item = _PyGen_Send((PyGenObject *)coro->obj, NULL); if (item == NULL) { - python_log_error("coroutine"); + kore_python_log_error("coroutine"); coro_running = NULL; return (KORE_RESULT_OK); } @@ -447,7 +447,7 @@ python_runtime_http_request(void *addr, struct http_request *req) Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_http_request"); + kore_python_log_error("python_runtime_http_request"); http_response(req, HTTP_STATUS_INTERNAL_ERROR, NULL, 0); return (KORE_RESULT_OK); } @@ -506,7 +506,7 @@ python_runtime_validator(void *addr, struct http_request *req, const void *data) Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_validator"); + kore_python_log_error("python_runtime_validator"); fatal("failed to execute python call"); } @@ -559,7 +559,7 @@ python_runtime_wsmessage(void *addr, struct connection *c, u_int8_t op, Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_wsconnect"); + kore_python_log_error("python_runtime_wsconnect"); fatal("failed to execute python call"); } @@ -581,7 +581,7 @@ python_runtime_execute(void *addr) Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_execute"); + kore_python_log_error("python_runtime_execute"); fatal("failed to execute python call"); } @@ -625,7 +625,7 @@ python_runtime_configure(void *addr, int argc, char **argv) Py_DECREF(list); if (pyret == NULL) { - python_log_error("python_runtime_configure"); + kore_python_log_error("python_runtime_configure"); fatal("failed to call configure method: wrong args?"); } @@ -654,7 +654,7 @@ python_runtime_onload(void *addr, int action) Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_onload"); + kore_python_log_error("python_runtime_onload"); return (KORE_RESULT_ERROR); } @@ -688,7 +688,7 @@ python_runtime_connect(void *addr, struct connection *c) Py_DECREF(args); if (pyret == NULL) { - python_log_error("python_runtime_connect"); + kore_python_log_error("python_runtime_connect"); kore_connection_disconnect(c); }