+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ 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 Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula common code library interface to Python
* Version $Id$
*
*/
-/*
- Copyright (C) 2004-2006 Kern Sibbald
-
- 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 amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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
- the file LICENSE for additional details.
-
- */
#include "bacula.h"
#include "jcr.h"
#undef _POSIX_C_SOURCE
#include <Python.h>
+#include "pythonlib.h"
+
/* Forward referenced subroutines */
static void init_python_lock();
static void term_python_lock();
-void lock_python();
-void unlock_python();
-
-extern char *configfile;
-
-/* Imported subroutines */
-//extern PyMethodDef JobMethods[];
-extern PyObject *job_getattr(PyObject *self, char *attrname);
-extern int job_setattr(PyObject *self, char *attrname, PyObject *value);
static PyObject *bacula_module = NULL; /* We create this */
static PyObject *StartUp_module = NULL; /* We import this */
/*
* This is a Bacula Job type as defined in Python. We store a pointer
- * to the jcr. That is all we need, but the user's script may keep
- * local data attached to this.
+ * to the jcr. That is all we need, but the user's script may keep
+ * local data attached to this.
*/
typedef struct s_JobObject {
PyObject_HEAD
return ((JobObject *)self)->jcr;
}
-
/* Start the interpreter */
-void init_python_interpreter(const char *progname, const char *scripts,
- const char *module)
+void init_python_interpreter(init_python_interpreter_args *args)
{
char buf[MAXSTRING];
- if (!scripts || scripts[0] == 0) {
- Dmsg1(100, "No script dir. prog=%s\n", module);
+ if (!args->scriptdir || args->scriptdir[0] == 0) {
+ Dmsg1(100, "No script dir. prog=%s\n", args->modulename);
return;
}
- Dmsg2(100, "Script dir=%s prog=%s\n", scripts, module);
+ Dmsg2(100, "Script dir=%s prog=%s\n", args->scriptdir, args->modulename);
- Py_SetProgramName((char *)progname);
+ Py_SetProgramName((char *)args->progname);
Py_Initialize();
PyEval_InitThreads();
bacula_module = Py_InitModule("bacula", BaculaMethods);
PyModule_AddStringConstant(bacula_module, "Name", my_name);
PyModule_AddStringConstant(bacula_module, "Version", my_version);
- PyModule_AddStringConstant(bacula_module, "ConfigFile", configfile);
- PyModule_AddStringConstant(bacula_module, "WorkingDir", (char *)working_directory);
+ PyModule_AddStringConstant(bacula_module, "ConfigFile", (char *)args->configfile);
+ PyModule_AddStringConstant(bacula_module, "WorkingDir", (char *)args->workingdir);
if (!bacula_module) {
Jmsg0(NULL, M_ERROR_TERM, 0, _("Could not initialize Python\n"));
}
bsnprintf(buf, sizeof(buf), "import sys\n"
- "sys.path.append('%s')\n", scripts);
+ "sys.path.append('%s')\n", args->scriptdir);
if (PyRun_SimpleString(buf) != 0) {
Jmsg1(NULL, M_ERROR_TERM, 0, _("Could not Run Python string %s\n"), buf);
}
JobType.tp_basicsize = sizeof(JobObject);
JobType.tp_flags = Py_TPFLAGS_DEFAULT;
JobType.tp_doc = "Bacula Job object";
- JobType.tp_getattr = job_getattr;
- JobType.tp_setattr = job_setattr;
+ JobType.tp_getattr = args->job_getattr;
+ JobType.tp_setattr = args->job_setattr;
if (PyType_Ready(&JobType) != 0) {
Jmsg0(NULL, M_ERROR_TERM, 0, _("Could not initialize Python Job type.\n"));
PyErr_Print();
}
- StartUp_module = PyImport_ImportModule((char *)module);
+ StartUp_module = PyImport_ImportModule((char *)args->modulename);
if (!StartUp_module) {
Emsg2(M_ERROR, 0, _("Could not import Python script %s/%s. Python disabled.\n"),
- scripts, module);
+ args->scriptdir, args->modulename);
if (PyErr_Occurred()) {
PyErr_Print();
Dmsg0(000, "Python Import error.\n");
init_python_lock();
}
-
void term_python_interpreter()
{
if (StartUp_module) {
return Py_None;
}
-
/*
* Check that a method exists and is callable.
*/
PyObject *pJob;
int stat = -1;
PyObject *result = NULL;
+ char *obj_fmt = (char *)"O";
if (!StartUp_module) {
Dmsg0(100, "No startup module.\n");
}
((JobObject *)pJob)->jcr = jcr;
bstrncpy(jcr->event, event, sizeof(jcr->event));
- result = PyObject_CallFunction(JobStart_method, "O", pJob);
+ result = PyObject_CallFunction(JobStart_method, obj_fmt, pJob);
jcr->event[0] = 0; /* no event in progress */
if (result == NULL) {
JobStart_method = NULL;
}
bstrncpy(jcr->event, event, sizeof(jcr->event));
Dmsg1(100, "Call daemon event=%s\n", event);
- result = PyObject_CallFunction(JobEnd_method, "O", jcr->Python_job);
+ result = PyObject_CallFunction(JobEnd_method, obj_fmt, jcr->Python_job);
jcr->event[0] = 0; /* no event in progress */
if (result == NULL) {
if (PyErr_Occurred()) {
if ((errstat=rwl_init(&python_rwlock)) != 0) {
berrno be;
Emsg1(M_ABORT, 0, _("Unable to initialize the Python lock. ERR=%s\n"),
- be.strerror(errstat));
+ be.bstrerror(errstat));
}
}
if ((errstat=rwl_writelock(&python_rwlock)) != 0) {
berrno be;
Emsg2(M_ABORT, 0, "Python rwl_writelock failure. stat=%d: ERR=%s\n",
- errstat, be.strerror(errstat));
+ errstat, be.bstrerror(errstat));
}
}
if ((errstat=rwl_writeunlock(&python_rwlock)) != 0) {
berrno be;
Emsg2(M_ABORT, 0, "Python rwl_writeunlock failure. stat=%d: ERR=%s\n",
- errstat, be.strerror(errstat));
+ errstat, be.bstrerror(errstat));
}
}
-
#else
/*
* problems even if it is not configured.
*/
int generate_daemon_event(JCR *jcr, const char *event) { return 0; }
-void init_python_interpreter(const char *progname, const char *scripts,
- const char *module) { }
-void term_python_interpreter() { }
#endif /* HAVE_PYTHON */
projects / bacula / bacula / blobdiff