/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 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
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
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
+ You should have received a copy of the GNU Affero 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.
*/
#include "sd_plugins.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 */
-
/* Imported functions */
extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code);
fprintf(stderr, _(
PROG_COPYRIGHT
"\nVersion: %s (%s)\n\n"
-"Usage: stored [options] [-c config_file] [config_file]\n"
+"Usage: bacula-sd [options] [-c config_file] [config_file]\n"
" -c <file> use <file> as configuration file\n"
" -d <nn> set debug level to <nn>\n"
" -dt print timestamp in debug output\n"
" -v verbose user messages\n"
" -? print this message.\n"
"\n"), 2000, VERSION, BDATE);
+
exit(1);
}
pthread_t thid;
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, "");
Jmsg0(NULL, M_ABORT, 0, _("Volume Session Time is ZERO!\n"));
}
-#ifdef HAVE_PYTHON
- python_args.progname = me->hdr.name;
- python_args.scriptdir = me->scripts_directory;
- python_args.modulename = "SDStartUp";
- python_args.configfile = configfile;
- python_args.workingdir = me->working_directory;
- python_args.job_getattr = job_getattr;
- python_args.job_setattr = job_setattr;
-
- init_python_interpreter(&python_args);
-#endif /* HAVE_PYTHON */
-
- /*
- * Start the device allocation thread
- */
+ /*
+ * Start the device allocation thread
+ */
create_volume_lists(); /* do before device_init */
if (pthread_create(&thid, NULL, device_initialization, NULL) != 0) {
berrno be;
pthread_detach(pthread_self());
jcr = new_jcr(sizeof(JCR), stored_free_jcr);
- jcr->set_JobType(JT_SYSTEM);
+ jcr->setJobType(JT_SYSTEM);
/* Initialize FD start condition variable */
int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
if (errstat != 0) {
}
jcr->dcr = dcr = new_dcr(jcr, NULL, dev);
+ generate_plugin_event(jcr, bsdEventDeviceInit, dcr);
if (dev->is_autochanger()) {
/* If autochanger set slot in dev sturcture */
get_autochanger_loaded_slot(dcr);
free_jcr(jcr);
continue; /* ignore console */
}
- set_jcr_job_status(jcr, JS_Canceled);
+ jcr->setJobStatus(JS_Canceled);
fd = jcr->file_bsock;
if (fd) {
fd->set_timed_out();
+ jcr->my_thread_send_signal(TIMEOUT_SIGNAL);
Dmsg1(100, "term_stored killing JobId=%d\n", jcr->JobId);
- pthread_kill(jcr->my_thread_id, TIMEOUT_SIGNAL);
/* ***FIXME*** wiffle through all dcrs */
if (jcr->dcr && jcr->dcr->dev && jcr->dcr->dev->blocked()) {
pthread_cond_broadcast(&jcr->dcr->dev->wait_next_vol);
config->free_resources();
free(config);
config = NULL;
- }
+ }
if (debug_level > 10) {
print_memory_pool_stats();