Start Python documentation

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1969 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/examples/python/DirStartUp.py b/bacula/examples/python/DirStartUp.py
index 37eaa28d5cf20a301dc95bc39cf58b8cfce0a53f..d6d0dae12ab7fb23867af8a328311de25153603b 100644 (file)
--- a/bacula/examples/python/DirStartUp.py
+++ b/bacula/examples/python/DirStartUp.py
@@ -21,7 +21,8 @@ class BaculaEvents:
      """
      events = JobEvents()         # create instance of Job class
      events.job = job             # save Bacula's job pointer
-     job.set_events = events      # register events desired
+#    job.set_events = events      # register events desired
+     job.set_events(events)     # register events desired
      sys.stderr = events          # send error output to Bacula
      sys.stdout = events          # send stdout to Bacula
      jobid = job.JobId; client = job.Client

diff --git a/bacula/src/dird/pythondir.c b/bacula/src/dird/pythondir.c
index 9869753cef5272d42a9a50478685adced5aef148..4ab14fb7856269d51a4454967fef7a4c6ac05da0 100644 (file)
--- a/bacula/src/dird/pythondir.c
+++ b/bacula/src/dird/pythondir.c
@@ -39,9 +39,25 @@ extern JCR *get_jcr_from_PyObject(PyObject *self);
 extern PyObject *find_method(PyObject *eventsObject, PyObject *method, 
          const char *name);
 
+
 static int set_job_events(PyObject *self, PyObject *arg);
 static int job_run(PyObject *self, PyObject *arg);
 
+#ifdef needed
+static PyObject *set_bacula_job_events(PyObject *self, PyObject *arg)
+{
+   Dmsg2(000, "In set_bacula_job_events self=%p arg=%p\n",
+      self, arg);
+   Py_INCREF(Py_None);
+   return Py_None;
+}
+PyMethodDef JobMethods[] = {
+    {"set_events", set_bacula_job_events, METH_VARARGS, "Define Bacula events."},
+    {NULL, NULL, 0, NULL}             /* last item */
+};
+#endif
+ 
+
 struct s_vars {
    const char *name;
    char *fmt;
@@ -205,6 +221,16 @@ bail_out:
    return -1;
 }
 
+#ifdef needed
+static PyObject *set_bacula_job_events(PyObject *self, PyObject *arg)
+{
+   Dmsg2(000, "In set_bacula_job_events self=%p arg=%p\n",
+      self, arg);
+   Py_INCREF(Py_None);
+   return Py_None;
+}
+#endif
+
 
 static int set_job_events(PyObject *self, PyObject *arg)
 {

diff --git a/bacula/src/lib/pythonlib.c b/bacula/src/lib/pythonlib.c
index 378c85036af27fc42c323f93d0d5fdf9c1704e56..5af7ff6a0a9ba5e6825fb7e4dda73e1b117b399f 100644 (file)
--- a/bacula/src/lib/pythonlib.c
+++ b/bacula/src/lib/pythonlib.c
@@ -120,7 +120,7 @@ void init_python_interpreter(const char *progname, const char *scripts,
    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();
@@ -262,8 +262,8 @@ int generate_daemon_event(JCR *jcr, const char *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;