* Version $Id$
*
*/
-
/*
- Copyright (C) 2004-2005 Kern Sibbald
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ 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 plus additions
+ that are listed 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
+ 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., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ 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 John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
#include "bacula.h"
#include "jcr.h"
#undef _POSIX_C_SOURCE
#include <Python.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);
{NULL, NULL, 0, NULL} /* last item */
};
+static char my_version[] = VERSION " " BDATE;
/*
* This is a Bacula Job type as defined in Python. We store a pointer
Py_Initialize();
PyEval_InitThreads();
bacula_module = Py_InitModule("bacula", BaculaMethods);
- PyModule_AddStringConstant(bacula_module, "name", my_name);
+ 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);
if (!bacula_module) {
- Jmsg0(NULL, M_ERROR_TERM, 0, "Could not initialize Python\n");
+ Jmsg0(NULL, M_ERROR_TERM, 0, _("Could not initialize Python\n"));
}
bsnprintf(buf, sizeof(buf), "import sys\n"
"sys.path.append('%s')\n", scripts);
if (PyRun_SimpleString(buf) != 0) {
- Jmsg1(NULL, M_ERROR_TERM, 0, "Could not Run Python string %s\n", buf);
+ Jmsg1(NULL, M_ERROR_TERM, 0, _("Could not Run Python string %s\n"), buf);
}
/* Explicitly set values we want */
JobType.tp_doc = "Bacula Job object";
JobType.tp_getattr = job_getattr;
JobType.tp_setattr = job_setattr;
-
+
if (PyType_Ready(&JobType) != 0) {
- Jmsg0(NULL, M_ERROR_TERM, 0, "Could not initialize Python Job type.\n");
+ Jmsg0(NULL, M_ERROR_TERM, 0, _("Could not initialize Python Job type.\n"));
PyErr_Print();
}
StartUp_module = PyImport_ImportModule((char *)module);
if (!StartUp_module) {
- Emsg2(M_ERROR, 0, "Could not import Python script %s/%s. Python disabled.\n",
+ Emsg2(M_ERROR, 0, _("Could not import Python script %s/%s. Python disabled.\n"),
scripts, module);
if (PyErr_Occurred()) {
PyErr_Print();
}
}
PyEval_ReleaseLock();
+ init_python_lock();
}
Py_XDECREF(StartUp_module);
Py_Finalize();
}
+ term_python_lock();
}
static PyObject *set_bacula_events(PyObject *self, PyObject *args)
}
Dmsg1(100, "event=%s\n", event);
- PyEval_AcquireLock();
+ lock_python();
+// PyEval_AcquireLock();
if (strcmp(event, "JobStart") == 0) {
if (!JobStart_method) {
stat = 0;
/* Create JCR argument to send to function */
pJob = (PyObject *)PyObject_New(JobObject, &JobType);
if (!pJob) {
- Jmsg(jcr, M_ERROR, 0, "Could not create Python Job Object.\n");
+ Jmsg(jcr, M_ERROR, 0, _("Could not create Python Job Object.\n"));
goto bail_out;
}
((JobObject *)pJob)->jcr = jcr;
PyErr_Print();
Dmsg0(000, "Python JobStart error.\n");
}
- Jmsg(jcr, M_ERROR, 0, "Python function \"%s\" not found.\n", event);
+ Jmsg(jcr, M_ERROR, 0, _("Python function \"%s\" not found.\n"), event);
Py_XDECREF(pJob);
goto bail_out;
}
} else if (strcmp(event, "JobEnd") == 0) {
if (!JobEnd_method || !jcr->Python_job) {
- Dmsg2(000, "No JobEnd method=%p Job=%p\n", JobEnd_method, jcr->Python_job);
- stat = 0;
+ stat = 0; /* probably already here */
goto bail_out;
}
bstrncpy(jcr->event, event, sizeof(jcr->event));
if (PyErr_Occurred()) {
PyErr_Print();
Dmsg2(000, "Python JobEnd error. job=%p JobId=%d\n", jcr->Python_job,
- jcr->JobId);
- JobEnd_method = NULL;
+ jcr->JobId);
+ JobEnd_method = NULL;
}
- Jmsg(jcr, M_ERROR, 0, "Python function \"%s\" not found.\n", event);
+ Jmsg(jcr, M_ERROR, 0, _("Python function \"%s\" not found.\n"), event);
goto bail_out;
}
stat = 1; /* OK */
}
stat = 1; /* OK */
} else {
- Jmsg1(jcr, M_ABORT, 0, "Unknown Python daemon event %s\n", event);
+ Jmsg1(jcr, M_ABORT, 0, _("Unknown Python daemon event %s\n"), event);
}
bail_out:
- Py_XDECREF((PyObject *)jcr->Python_job);
- jcr->Python_job = NULL;
- Py_XDECREF((PyObject *)jcr->Python_events);
- jcr->Python_events = NULL;
+ if (jcr) {
+ Py_XDECREF((PyObject *)jcr->Python_job);
+ jcr->Python_job = NULL;
+ Py_XDECREF((PyObject *)jcr->Python_events);
+ jcr->Python_events = NULL;
+ }
/* Fall through */
jobstart_ok:
Py_XDECREF(result);
- PyEval_ReleaseLock();
+ unlock_python();
+// PyEval_ReleaseLock();
return stat;
}
+static brwlock_t python_rwlock;
+
+static void init_python_lock()
+{
+ int errstat;
+ 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));
+ }
+
+}
+
+static void term_python_lock()
+{
+ rwl_destroy(&python_rwlock);
+}
+
+/* This applies to a drive and to Volumes */
+void lock_python()
+{
+ int 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));
+ }
+}
+
+void unlock_python()
+{
+ int 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));
+ }
+}
+
+
#else
/*
projects / bacula / bacula / blobdiff