ebl decrease the debug ouput

[bacula/bacula] / bacula / src / lib / pythonlib.c

diff --git a/bacula/src/lib/pythonlib.c b/bacula/src/lib/pythonlib.c
index cc432cfdc9d8198affb2de6a1d82bdcdc5da6da4..9568ca91a43888a7bd592bf4895e2abffcf29e97 100644 (file)
--- a/bacula/src/lib/pythonlib.c
+++ b/bacula/src/lib/pythonlib.c
@@ -1,3 +1,30 @@
+/*
+   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
@@ -7,20 +34,6 @@
  *   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"
@@ -219,6 +232,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
    PyObject *pJob;
    int stat = -1;
    PyObject *result = NULL;
+   char *obj_fmt = (char *)"O";
 
    if (!StartUp_module) {
       Dmsg0(100, "No startup module.\n");
@@ -241,7 +255,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
       }
       ((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;
@@ -264,7 +278,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
       }
       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()) {
@@ -314,7 +328,7 @@ static void init_python_lock()
    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));
    }
 
 }
@@ -331,7 +345,7 @@ void lock_python()
    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));
    }
 }
 
@@ -341,7 +355,7 @@ void unlock_python()
    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));
    }
 }