Ignore UTF-8 marker at the start of .conf files.

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

diff --git a/bacula/src/lib/pythonlib.c b/bacula/src/lib/pythonlib.c
index 957e0e4bcef35db8ebd871cba8fb48a6d1679f8c..cc432cfdc9d8198affb2de6a1d82bdcdc5da6da4 100644 (file)
--- a/bacula/src/lib/pythonlib.c
+++ b/bacula/src/lib/pythonlib.c
@@ -8,7 +8,7 @@
  *
  */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   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
@@ -30,6 +30,14 @@
 #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);
@@ -55,6 +63,7 @@ static PyMethodDef BaculaMethods[] = {
     {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
@@ -97,14 +106,17 @@ void init_python_interpreter(const char *progname, const char *scripts,
    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 */
@@ -116,12 +128,12 @@ void init_python_interpreter(const char *progname, const char *scripts,
    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();
@@ -129,6 +141,7 @@ void init_python_interpreter(const char *progname, const char *scripts,
       }
    }
    PyEval_ReleaseLock();
+   init_python_lock();
 }
 
 
@@ -138,6 +151,7 @@ void term_python_interpreter()
       Py_XDECREF(StartUp_module);
       Py_Finalize();
    }
+   term_python_lock();
 }
 
 static PyObject *set_bacula_events(PyObject *self, PyObject *args)
@@ -212,7 +226,8 @@ int generate_daemon_event(JCR *jcr, const char *event)
    }
 
    Dmsg1(100, "event=%s\n", event);
-   PyEval_AcquireLock();
+   lock_python();
+// PyEval_AcquireLock();
    if (strcmp(event, "JobStart") == 0) {
       if (!JobStart_method) {
          stat = 0;
@@ -221,7 +236,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
       /* 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;
@@ -234,7 +249,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
             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;
       }
@@ -258,7 +273,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
                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 */
@@ -273,7 +288,7 @@ int generate_daemon_event(JCR *jcr, const char *event)
       }
       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:
@@ -286,10 +301,51 @@ bail_out:
    /* 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
 
 /*