Fix python persist crash if there is no global python block

modules/python/CMakeLists.txt

@@ -38,6 +38,12 @@ set(PYTHON_SOURCES
     python-logtemplate-options.c
     python-global-code-loader.h
     python-global-code-loader.c
+    python-binding.h
+    python-binding.c
+    python-startup.h
+    python-startup.c
+    python-global.h
+    python-global.c
     python-debugger.c
     python-debugger.h
     python-logparser.h

modules/python/Makefile.am

@@ -24,6 +24,8 @@ modules_python_libmod_python_la_SOURCES		= \
 	modules/python/compat/compat-python.h     \
 	modules/python/compat/compat-python.c     \
 	modules/python/python-module.h		  \
+	modules/python/python-binding.h		  \
+	modules/python/python-binding.c		  \
 	modules/python/python-config.h		  \
 	modules/python/python-config.c		  \
 	modules/python/python-persist.h		  \
@@ -36,6 +38,10 @@ modules_python_libmod_python_la_SOURCES		= \
 	modules/python/python-grammar.y		  \
 	modules/python/python-value-pairs.c	  \
 	modules/python/python-value-pairs.h	  \
+	modules/python/python-startup.c		  \
+	modules/python/python-startup.h		  \
+	modules/python/python-global.c		  \
+	modules/python/python-global.h		  \
 	modules/python/python-dest.c		  \
 	modules/python/python-dest.h		  \
 	modules/python/python-tf.c		  \

modules/python/python-binding.c

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2023 Balazs Scheidler <balazs.scheidler@axoflow.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As an additional exemption you are allowed to compile & link against the
+ * OpenSSL libraries as published by the OpenSSL project. See the file
+ * COPYING for details.
+ *
+ */
+
+#include "python-binding.h"
+#include "python-helpers.h"
+#include "python-main.h"
+#include "string-list.h"
+#include "messages.h"
+
+void
+python_binding_set_loaders(PythonBinding *self, GList *loaders)
+{
+  string_list_free(self->loaders);
+  self->loaders = loaders;
+}
+
+void
+python_binding_set_class(PythonBinding *self, gchar *class)
+{
+  g_free(self->class);
+  self->class = g_strdup(class);
+}
+
+/*
+ * Should be called at log_pipe_init() time.  The Python lock is acquired as
+ * a part of this function.
+ */
+gboolean
+python_binding_init(PythonBinding *self, GlobalConfig *cfg, const gchar *desc)
+{
+  if (!self->class)
+    {
+      msg_error("Error initializing Python bindings: no class specified",
+                evt_tag_str("config", desc));
+      return FALSE;
+    }
+
+  PyGILState_STATE gstate;
+  gboolean result = TRUE;
+
+  gstate = PyGILState_Ensure();
+  if (!_py_init_main_module_for_config(python_config_get(cfg)) ||
+      !_py_perform_imports(self->loaders))
+    result = FALSE;
+  PyGILState_Release(gstate);
+
+  return result;
+}
+
+void
+python_binding_deinit(PythonBinding *self)
+{
+}
+
+void
+python_binding_clone(PythonBinding *self, PythonBinding *cloned)
+{
+  python_binding_set_class(cloned, self->class);
+  python_binding_set_loaders(cloned, string_list_clone(self->loaders));
+
+  python_options_free(cloned->options);
+  cloned->options = python_options_clone(self->options);
+}
+
+void
+python_binding_init_instance(PythonBinding *self)
+{
+  self->options = python_options_new();
+}
+
+void
+python_binding_clear(PythonBinding *self)
+{
+  g_free(self->class);
+  string_list_free(self->loaders);
+  python_options_free(self->options);
+}

modules/python/python-binding.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2023 Balazs Scheidler <balazs.scheidler@axoflow.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As an additional exemption you are allowed to compile & link against the
+ * OpenSSL libraries as published by the OpenSSL project. See the file
+ * COPYING for details.
+ *
+ */
+
+#ifndef PYTHON_BINDING_H_INCLUDED
+#define PYTHON_BINDING_H_INCLUDED 1
+
+#include "python-options.h"
+
+typedef struct _PythonBinding
+{
+  gchar *class;
+  GList *loaders;
+
+  PythonOptions *options;
+} PythonBinding;
+
+void python_binding_set_loaders(PythonBinding *self, GList *loaders);
+void python_binding_set_class(PythonBinding *self, gchar *class);
+
+gboolean python_binding_init(PythonBinding *self, GlobalConfig *cfg, const gchar *desc);
+void python_binding_deinit(PythonBinding *self);
+
+void python_binding_clone(PythonBinding *self, PythonBinding *cloned);
+void python_binding_init_instance(PythonBinding *self);
+void python_binding_clear(PythonBinding *self);
+
+#endif

modules/python/python-config.c

@@ -34,7 +34,7 @@ python_config_init(ModuleConfig *s, GlobalConfig *cfg)
 
   PyGILState_STATE gstate;
   gstate = PyGILState_Ensure();
-  _py_switch_main_module(self);
+  _py_switch_to_config_main_module(self);
   PyGILState_Release(gstate);
   return TRUE;
 }