/*
- *
- * Bacula interface to Python for the File Daemon
- *
- * Kern Sibbald, March MMV
- *
- * Version $Id$
- *
- */
+ Bacula® - The Network Backup Solution
-/*
- Copyright (C) 2005 Kern Sibbald
+ Copyright (C) 2005-2008 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 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
+ 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.
+*/
+/*
+ *
+ * Bacula interface to Python for the File Daemon
+ *
+ * Kern Sibbald, March MMV
+ *
+ * Version $Id$
+ *
*/
#include "bacula.h"
#undef _POSIX_C_SOURCE
#include <Python.h>
-/* External function pointers to be set */
-extern bool (*python_set_prog)(JCR *jcr, const char *prog);
-extern int (*python_open)(BFILE *bfd, const char *fname, int flags, mode_t mode);
-extern int (*python_close)(BFILE *bfd);
-extern ssize_t (*python_read)(BFILE *bfd, void *buf, size_t count);
-
extern JCR *get_jcr_from_PyObject(PyObject *self);
extern PyObject *find_method(PyObject *eventsObject, PyObject *method,
const char *name);
/* Forward referenced functions */
-static int set_job_events(PyObject *self, PyObject *arg);
+static PyObject *set_job_events(PyObject *self, PyObject *arg);
+static PyObject *job_write(PyObject *self, PyObject *arg);
-bool my_python_set_prog(JCR *jcr, const char *prog);
-int my_python_open(BFILE *bfd, const char *fname, int flags, mode_t mode);
-int my_python_close(BFILE *bfd);
-ssize_t my_python_read(BFILE *bfd, void *buf, size_t count);
+PyMethodDef JobMethods[] = {
+ {"set_events", set_job_events, METH_VARARGS, "Set Job events"},
+ {"write", job_write, METH_VARARGS, "Write to output"},
+ {NULL, NULL, 0, NULL} /* last item */
+};
struct s_vars {
/* Read-only variables */
static struct s_vars getvars[] = {
- { N_("FDName"), "s"}, /* 0 */
- { N_("Level"), "s"}, /* 1 */
- { N_("Type"), "s"}, /* 2 */
- { N_("JobId"), "i"}, /* 3 */
- { N_("Client"), "s"}, /* 4 */
- { N_("JobName"), "s"}, /* 5 */
- { N_("JobStatus"), "s"}, /* 6 */
+ { NT_("FDName"), "s"}, /* 0 */
+ { NT_("Level"), "s"}, /* 1 */
+ { NT_("Type"), "s"}, /* 2 */
+ { NT_("JobId"), "i"}, /* 3 */
+ { NT_("Client"), "s"}, /* 4 */
+ { NT_("JobName"), "s"}, /* 5 */
+ { NT_("JobStatus"), "s"}, /* 6 */
{ NULL, NULL}
};
/* Writable variables */
static struct s_vars setvars[] = {
- { N_("set_events"), NULL},
- { N_("JobReport"), "s"},
- { N_("write"), "s"},
+ { NT_("JobReport"), "s"},
{ NULL, NULL}
};
jcr = get_jcr_from_PyObject(self);
if (!jcr) {
- bstrncpy(errmsg, "Job pointer not found.", sizeof(errmsg));
+ bstrncpy(errmsg, _("Job pointer not found."), sizeof(errmsg));
goto bail_out;
}
for (i=0; getvars[i].name; i++) {
}
}
if (!found) {
- goto not_found;
+ /* Try our methods */
+ return Py_FindMethod(JobMethods, self, attrname);
}
switch (i) {
case 0: /* FD's name */
buf[0] = jcr->JobStatus;
return Py_BuildValue(getvars[i].fmt, buf);
}
-not_found:
- bsnprintf(errmsg, sizeof(errmsg), "Attribute %s not found.", attrname);
+ bsnprintf(errmsg, sizeof(errmsg), _("Attribute %s not found."), attrname);
bail_out:
PyErr_SetString(PyExc_AttributeError, errmsg);
return NULL;
Dmsg2(100, "In job_setattr=%s val=%p.\n", attrname, value);
if (value == NULL) { /* Cannot delete variables */
- bsnprintf(buf, sizeof(buf), "Cannot delete attribute %s", attrname);
+ bsnprintf(buf, sizeof(buf), _("Cannot delete attribute %s"), attrname);
errmsg = buf;
goto bail_out;
}
jcr = get_jcr_from_PyObject(self);
if (!jcr) {
- errmsg = "Job pointer not found.";
+ errmsg = _("Job pointer not found.");
goto bail_out;
}
}
}
if (!found) {
- bsnprintf(buf, sizeof(buf), "Cannot find attribute %s", attrname);
+ bsnprintf(buf, sizeof(buf), _("Cannot find attribute %s"), attrname);
errmsg = buf;
goto bail_out;
}
/* Get argument value ***FIXME*** handle other formats */
if (setvars[i].fmt != NULL) {
if (!PyArg_Parse(value, setvars[i].fmt, &strval)) {
- PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+ PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
}
switch (i) {
- case 0: /* set_events */
- return set_job_events(self, value);
- case 1: /* JobReport */
- case 2: /* write */
+ case 0: /* JobReport */
Jmsg(jcr, M_INFO, 0, "%s", strval);
return 0;
}
- bsnprintf(buf, sizeof(buf), "Cannot find attribute %s", attrname);
+ bsnprintf(buf, sizeof(buf), _("Cannot find attribute %s"), attrname);
errmsg = buf;
bail_out:
PyErr_SetString(PyExc_AttributeError, errmsg);
}
+static PyObject *job_write(PyObject *self, PyObject *args)
+{
+ char *text = NULL;
-static int set_job_events(PyObject *self, PyObject *arg)
+ if (!PyArg_ParseTuple(args, "s:write", &text)) {
+ Pmsg0(000, "Parse tuple error in job_write\n");
+ return NULL;
+ }
+ if (text) {
+ Jmsg(NULL, M_INFO, 0, "%s", text);
+ }
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+
+static PyObject *set_job_events(PyObject *self, PyObject *arg)
{
PyObject *eObject;
JCR *jcr;
Dmsg0(100, "In set_job_events.\n");
- if (!PyArg_Parse(arg, "O", &eObject)) {
- Dmsg0(000, "Parse error looking for Object argument\n");
- return -1;
+ if (!PyArg_ParseTuple(arg, "O", &eObject)) {
+ Pmsg0(000, "Parse error looking for Object argument\n");
+ return NULL;
}
jcr = get_jcr_from_PyObject(self);
if (!jcr) {
- PyErr_SetString(PyExc_AttributeError, "Job pointer not found.");
- return -1;
+ PyErr_SetString(PyExc_AttributeError, _("Job pointer not found."));
+ return NULL;
}
Py_XDECREF((PyObject *)jcr->Python_events); /* release any old events Object */
Py_INCREF(eObject);
jcr->Python_events = (void *)eObject; /* set new events */
- /* Set function pointers to call here */
- python_set_prog = my_python_set_prog;
- python_open = my_python_open;
- python_close = my_python_close;
- python_read = my_python_read;
-
- return 0;
+ Py_INCREF(Py_None);
+ return Py_None;
}
{
PyObject *method = NULL;
PyObject *Job = (PyObject *)jcr->Python_job;
+ PyObject *events = (PyObject *)jcr->Python_events;
PyObject *result = NULL;
int stat = 0;
- if (!Job) {
+ if (!Job || !events) {
return 0;
}
- PyEval_AcquireLock();
+ lock_python();
+// PyEval_AcquireLock();
- PyObject *events = (PyObject *)jcr->Python_events;
method = find_method(events, method, event);
if (!method) {
goto bail_out;
if (result == NULL) {
if (PyErr_Occurred()) {
PyErr_Print();
- Dmsg1(000, "Error in Python method %s\n", event);
+ Pmsg1(000, "Error in Python method %s\n", event);
}
} else {
stat = 1;
Py_XDECREF(result);
bail_out:
- PyEval_ReleaseLock();
+ unlock_python();
+// PyEval_ReleaseLock();
return stat;
}
-bool my_python_set_prog(JCR *jcr, const char *prog)
-{
- PyObject *events = (PyObject *)jcr->Python_events;
- BFILE *bfd = &jcr->ff->bfd;
- char method[MAX_NAME_LENGTH];
-
- if (!events) {
- return false;
- }
- bstrncpy(method, prog, sizeof(method));
- bstrncat(method, "_", sizeof(method));
- bstrncat(method, "open", sizeof(method));
- bfd->pio.fo = find_method(events, bfd->pio.fo, method);
- bstrncpy(method, prog, sizeof(method));
- bstrncat(method, "_", sizeof(method));
- bstrncat(method, "read", sizeof(method));
- bfd->pio.fr = find_method(events, bfd->pio.fr, method);
- bstrncpy(method, prog, sizeof(method));
- bstrncat(method, "_", sizeof(method));
- bstrncat(method, "close", sizeof(method));
- bfd->pio.fc = find_method(events, bfd->pio.fc, method);
- return bfd->pio.fo && bfd->pio.fr && bfd->pio.fc;
-}
-
-int my_python_open(BFILE *bfd, const char *fname, int flags, mode_t mode)
-{
- return -1;
-}
-
-int my_python_close(BFILE *bfd)
-{
- return 0;
-}
-
-ssize_t my_python_read(BFILE *bfd, void *buf, size_t count)
-{
- return -1;
-}
-
#else
/* Dummy if Python not configured */
projects / bacula / bacula / blobdiff