Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ 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.
#include "bacula.h"
#include "dird.h"
+#ifdef HAVE_PYTHON
+
+#undef _POSIX_C_SOURCE
+#include <Python.h>
+
+#include "lib/pythonlib.h"
+
+/* Imported Functions */
+extern PyObject *job_getattr(PyObject *self, char *attrname);
+extern int job_setattr(PyObject *self, char *attrname, PyObject *value);
+
+#endif /* HAVE_PYTHON */
+
/* Forward referenced subroutines */
void terminate_dird(int sig);
static bool check_resources();
/* Exported subroutines */
extern "C" void reload_config(int sig);
extern void invalidate_schedules();
-
+extern bool parse_dir_config(CONFIG *config, const char *configfile, int exit_code);
/* Imported subroutines */
JCR *wait_for_next_job(char *runjob);
void *start_heap;
/* Globals Imported */
-extern int r_first, r_last; /* first and last resources */
-extern RES_TABLE resources[];
-extern RES **res_head;
extern RES_ITEM job_items[];
-extern int res_all_size;
-
#if defined(_MSC_VER)
extern "C" { // work around visual compiler mangling variables
- extern URES res_all;
+ extern URES res_all;
}
#else
extern URES res_all;
bool test_config = false;
char *uid = NULL;
char *gid = NULL;
+#ifdef HAVE_PYTHON
+ init_python_interpreter_args python_args;
+#endif /* HAVE_PYTHON */
start_heap = sbrk(0);
setlocale(LC_ALL, "");
}
config = new_config_parser();
- config->init(configfile, NULL, M_ERROR_TERM, (void *)&res_all, res_all_size,
- r_first, r_last, resources, res_head);
- config->parse_config();
+ parse_dir_config(config, configfile, M_ERROR_TERM);
if (init_crypto() != 0) {
Jmsg((JCR *)NULL, M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
FDConnectTimeout = (int)director->FDConnectTimeout;
SDConnectTimeout = (int)director->SDConnectTimeout;
-
#if !defined(HAVE_WIN32)
signal(SIGHUP, reload_config);
#endif
init_console_msg(working_directory);
- init_python_interpreter(director->name(), director->scripts_directory,
- "DirStartUp");
+#ifdef HAVE_PYTHON
+ python_args.progname = director->name();
+ python_args.scriptdir = director->scripts_directory;
+ python_args.modulename = "DirStartUp";
+ python_args.configfile = configfile;
+ python_args.workingdir = director->working_directory;
+ python_args.job_getattr = job_getattr;
+ python_args.job_setattr = job_setattr;
+
+ init_python_interpreter(&python_args);
+#endif /* HAVE_PYTHON */
set_thread_concurrency(director->MaxConcurrentJobs * 2 +
4 /* UA */ + 4 /* sched+watchdog+jobsvr+misc */);
init_job_server(director->MaxConcurrentJobs);
+ dbg_add_hook(_db_print_dbg); /* used to debug B_DB connexion after fatal signal */
+
// init_device_resources();
Dmsg0(200, "wait for next job\n");
if (debug_level > 5) {
print_memory_pool_stats();
}
- config->free_resources();
- free(config);
- config = NULL;
+ if (config) {
+ config->free_resources();
+ free(config);
+ config = NULL;
+ }
term_ua_server();
term_msg(); /* terminate message handler */
cleanup_crypto();
reload_table[table].res_table = config->save_resources();
Dmsg1(100, "Saved old config in table %d\n", table);
- ok = parse_config(configfile, 0, M_ERROR); /* no exit on error */
+ ok = parse_dir_config(config, configfile, M_ERROR);
Dmsg0(100, "Reloaded config file\n");
if (!ok || !check_resources() || !check_catalog()) {
* Hook all active jobs so that they release this table
*/
foreach_jcr(jcr) {
- if (jcr->JobType != JT_SYSTEM) {
+ if (jcr->get_JobType() != JT_SYSTEM) {
reload_table[table].job_count++;
job_end_push(jcr, reload_job_end_cb, (void *)((long int)table));
njobs++;
db_create_storage_record(NULL, db, &sr);
store->StorageId = sr.StorageId; /* set storage Id */
if (!sr.created) { /* if not created, update it */
+ sr.AutoChanger = store->autochanger;
db_update_storage_record(NULL, db, &sr);
}