Couple of srvx updates.

[irc/evilnet/x3.git] / src / mod-python.c

diff --git a/src/mod-python.c b/src/mod-python.c
index 62fce59914e37e2066c7f43b2ce4978c48f6d399..6322041cedc670e1d6d28d4b803fc26d233f1604 100644 (file)
--- a/src/mod-python.c
+++ b/src/mod-python.c
@@ -1194,6 +1194,60 @@ emb_service_register(UNUSED_ARG(PyObject* self_), PyObject* args) {
     return pyobj_from_service(service_register(user));
 }
 
+size_t logs_size = 0;
+static struct log_type **logs_list = NULL;
+
+PyDoc_STRVAR(emb_log_register_type__doc__,
+        "registers a log source to write event data to.");
+static PyObject* emb_log_register_type(UNUSED_ARG(PyObject *self), PyObject* args) {
+    const char* logName;
+    const char* defaultLog;
+    struct log_type* log;
+    struct log_type** newlogs;
+
+    if (!PyArg_ParseTuple(args, "ss", &logName, &defaultLog))
+        return NULL;
+
+    newlogs = realloc(logs_list, (logs_size+1)*sizeof(struct log_type*));
+    if (newlogs == NULL) {
+        PyErr_SetString(PyExc_Exception, "unable to allocate memory for log structures. aborting.");
+        return NULL;
+    }
+    logs_list = newlogs;
+
+    log = log_register_type(logName, defaultLog);
+    if (log == NULL) {
+        PyErr_SetString(PyExc_Exception, "unable to register log");
+        return NULL;
+    }
+
+    logs_list[logs_size++] = log;
+
+    return Py_BuildValue("O", PyCObject_FromVoidPtr(log, NULL));
+}
+
+PyDoc_STRVAR(emb_module_register__doc__, "registers a module");
+PyObject* emb_module_register(UNUSED_ARG(PyObject* self), PyObject* args) {
+    PyObject* pylog;
+    char const *name, *helpfile;
+    struct log_type* log;
+    struct module* mod;
+
+    if (!PyArg_ParseTuple(args, "sOs", &name, &pylog, &helpfile))
+        return NULL;
+
+    log = PyCObject_AsVoidPtr(pylog);
+
+    mod = module_register(name, log, helpfile, NULL);
+
+    if (mod == NULL) {
+        PyErr_SetString(PyExc_Exception, "unable to register module");
+        return NULL;
+    }
+
+    return Py_BuildValue("O", PyCObject_FromVoidPtr(mod, NULL));
+}
+
 static PyMethodDef EmbMethods[] = {
     /* Communication methods */
     {"dump", emb_dump, METH_VARARGS, emb_dump__doc__},
@@ -1224,6 +1278,12 @@ static PyMethodDef EmbMethods[] = {
     {"timeq_add", emb_timeq_add, METH_VARARGS, emb_timeq_add__doc__},
     {"timeq_del", emb_timeq_del, METH_VARARGS, emb_timeq_del__doc__},
 
+    /* module registration methods */
+    {"log_register_type", emb_log_register_type, METH_VARARGS,
+        emb_log_register_type__doc__},
+    {"module_register", emb_module_register, METH_VARARGS,
+        emb_module_register__doc__},
+
     /* Information gathering methods */
     {"get_user", emb_get_user, METH_VARARGS, emb_get_user__doc__},
     {"get_users", emb_get_users, METH_VARARGS, emb_get_users__doc__},
@@ -1847,7 +1907,7 @@ python_finalize(void) {
 }
 
 static void
-python_cleanup(void) {
+python_cleanup(UNUSED_ARG(void *extra)) {
     /* Called on shutdown of the python module  (or before reloading)
     */
 
@@ -1870,7 +1930,7 @@ static MODCMD_FUNC(cmd_reload) {
     /* reload the python system completely 
     */
     log_module(PY_LOG, LOG_INFO, "Shutting python down");
-    python_cleanup();
+    python_cleanup(NULL);
     log_module(PY_LOG, LOG_INFO, "Loading python stuff");
     if(python_load()) {
          reply("PYMSG_RELOAD_SUCCESS");
@@ -2018,7 +2078,7 @@ int python_init(void) {
 //TODO:    reg_allchanmsg_func
 //TODO:    reg_user_mode_func
 
-    reg_exit_func(python_cleanup);
+    reg_exit_func(python_cleanup, NULL);
 
     python_load();
     return 1;