* Version $Id$
*
*/
-
/*
Copyright (C) 2004-2005 Kern Sibbald
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.
+ 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 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
#undef _POSIX_C_SOURCE
#include <Python.h>
+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");
}
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");
PyErr_Print();
} 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);
goto bail_out;
}
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);