*
*/
/*
- 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
#include <Python.h>
extern char *configfile;
+extern struct s_jl joblevels[];
extern JCR *get_jcr_from_PyObject(PyObject *self);
extern PyObject *find_method(PyObject *eventsObject, PyObject *method,
const char *name);
/* Read-only variables */
static struct s_vars getvars[] = {
- { N_("Job"), "s"},
- { N_("DirName"), "s"},
- { N_("Level"), "s"},
- { N_("Type"), "s"},
- { N_("JobId"), "i"},
- { N_("Client"), "s"},
- { N_("NumVols"), "i"},
- { N_("Pool"), "s"},
- { N_("Storage"), "s"},
- { N_("Catalog"), "s"},
- { N_("MediaType"), "s"},
- { N_("JobName"), "s"},
- { N_("JobStatus"), "s"},
- { N_("Priority"), "i"},
- { N_("Version"), "(ss)"},
- { N_("ConfigFile"), "s"},
- { N_("WorkingDir"), "s"},
- { N_("CatalogRes"), "(sssssis)"},
+ { "Job", "s"},
+ { "Level", "s"},
+ { "Type", "s"},
+ { "JobId", "i"},
+ { "Client", "s"},
+ { "NumVols", "i"},
+ { "Pool", "s"},
+ { "Storage", "s"},
+ { "Catalog", "s"},
+ { "MediaType", "s"},
+ { "JobName", "s"},
+ { "JobStatus", "s"},
+ { "Priority", "i"},
+ { "VolumeName", "s"},
+ { "CatalogRes", "(sssssis)"},
{ NULL, NULL}
};
/* Writable variables */
static struct s_vars setvars[] = {
- { N_("JobReport"), "s"},
- { N_("VolumeName"), "s"},
- { N_("Priority"), "i"},
+ { "JobReport", "s"},
+ { "VolumeName", "s"},
+ { "Priority", "i"},
+ { "JobLevel", "s"},
{ NULL, NULL}
};
Dmsg0(100, "In job_getattr.\n");
jcr = get_jcr_from_PyObject(self);
if (!jcr) {
- bstrncpy(errmsg, "Job pointer not found.", sizeof(errmsg));
+ bstrncpy(errmsg, _("Job pointer not found."), sizeof(errmsg));
goto bail_out;
}
for (i=0; getvars[i].name; i++) {
switch (i) {
case 0: /* Job */
return Py_BuildValue(getvars[i].fmt, jcr->job->hdr.name);
- case 1: /* Director's name */
- return Py_BuildValue(getvars[i].fmt, my_name);
- case 2: /* level */
+ case 1: /* level */
return Py_BuildValue(getvars[i].fmt, job_level_to_str(jcr->JobLevel));
- case 3: /* type */
+ case 2: /* type */
return Py_BuildValue(getvars[i].fmt, job_type_to_str(jcr->JobType));
- case 4: /* JobId */
+ case 3: /* JobId */
return Py_BuildValue(getvars[i].fmt, jcr->JobId);
- case 5: /* Client */
+ case 4: /* Client */
return Py_BuildValue(getvars[i].fmt, jcr->client->hdr.name);
- case 6: /* NumVols */
+ case 5: /* NumVols */
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
jcr->NumVols = pr.NumVols;
return Py_BuildValue(getvars[i].fmt, jcr->NumVols);
} else {
- bsnprintf(errmsg, sizeof(errmsg), "Pool record not found.");
+ bsnprintf(errmsg, sizeof(errmsg), _("Pool record not found."));
goto bail_out;
}
- case 7: /* Pool */
- return Py_BuildValue(getvars[i].fmt, jcr->pool->hdr.name);
- case 8: /* Storage */
- return Py_BuildValue(getvars[i].fmt, jcr->store->hdr.name);
- case 9:
- return Py_BuildValue(getvars[i].fmt, jcr->catalog->hdr.name);
- case 10: /* MediaType */
- return Py_BuildValue(getvars[i].fmt, jcr->store->media_type);
- case 11: /* JobName */
+ case 6: /* Pool */
+ return Py_BuildValue(getvars[i].fmt, jcr->pool->name());
+ case 7: /* Storage */
+ if (jcr->wstore) {
+ return Py_BuildValue(getvars[i].fmt, jcr->wstore->name());
+ } else if (jcr->rstore) {
+ return Py_BuildValue(getvars[i].fmt, jcr->rstore->name());
+ } else {
+ goto bail_out;
+ }
+ case 8:
+ return Py_BuildValue(getvars[i].fmt, jcr->catalog->name());
+ case 9: /* MediaType */
+ if (jcr->wstore) {
+ return Py_BuildValue(getvars[i].fmt, jcr->wstore->media_type);
+ } else if (jcr->rstore) {
+ return Py_BuildValue(getvars[i].fmt, jcr->rstore->media_type);
+ } else {
+ goto bail_out;
+ }
+ case 10: /* JobName */
return Py_BuildValue(getvars[i].fmt, jcr->Job);
- case 12: /* JobStatus */
+ case 11: /* JobStatus */
buf[1] = 0;
buf[0] = jcr->JobStatus;
return Py_BuildValue(getvars[i].fmt, buf);
- case 13: /* Priority */
+ case 12: /* Priority */
return Py_BuildValue(getvars[i].fmt, jcr->JobPriority);
- case 14: /* Version */
- return Py_BuildValue(getvars[i].fmt, VERSION, BDATE);
- case 15: /* Config Dir */
- return Py_BuildValue(getvars[i].fmt, configfile);
- case 16: /* Working Dir */
- return Py_BuildValue(getvars[i].fmt, director->working_directory);
- case 17: /* CatalogRes */
+ case 13:
+ return Py_BuildValue(getvars[i].fmt, jcr->VolumeName);
+ case 14: /* CatalogRes */
return Py_BuildValue(getvars[i].fmt,
jcr->catalog->db_name, jcr->catalog->db_address,
jcr->catalog->db_user, jcr->catalog->db_password,
catalog_db);
}
- bsnprintf(errmsg, sizeof(errmsg), "Attribute %s not found.", attrname);
+ bsnprintf(errmsg, sizeof(errmsg), _("Attribute %s not found."), attrname);
bail_out:
PyErr_SetString(PyExc_AttributeError, errmsg);
return NULL;
switch (setvars[i].fmt[0]) {
case 's':
if (!PyArg_Parse(value, setvars[i].fmt, &strval)) {
- PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+ PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
break;
case 'i':
if (!PyArg_Parse(value, setvars[i].fmt, &intval)) {
- PyErr_SetString(PyExc_TypeError, "Read-only attribute");
+ PyErr_SetString(PyExc_TypeError, _("Read-only attribute"));
return -1;
}
break;
break;
case 2: /* Priority */
Dmsg1(000, "Set priority=%d\n", intval);
- return 0;
+ if (intval >= 1 && intval <= 100) {
+ jcr->JobPriority = intval;
+ } else {
+ PyErr_SetString(PyExc_ValueError, _("Priority must be 1-100"));
+ return -1;
+ }
+ case 3: /* Job Level */
+ if (strcmp("JobInit", jcr->event) != 0) {
+ PyErr_SetString(PyExc_RuntimeError, _("Job Level can be set only during JobInit"));
+ return -1;
+ }
+ for (i=0; joblevels[i].level_name; i++) {
+ if (strcmp(strval, joblevels[i].level_name) == 0) {
+ if (joblevels[i].job_type == jcr->JobType) {
+ jcr->JobLevel = joblevels[i].level;
+ return 0;
+ }
+ }
+ }
+ PyErr_SetString(PyExc_ValueError, _("Bad JobLevel string"));
+ return -1;
}
bail_out:
PyErr_SetString(PyExc_AttributeError, attrname);
return -1;
}
-
+/*
+ * Set pointer to instantiated events class
+ */
static PyObject *set_job_events(PyObject *self, PyObject *arg)
{
PyObject *eObject;
return Py_None;
}
-/* Run a Bacula command */
+/* Run a Bacula job */
static PyObject *job_run(PyObject *self, PyObject *arg)
{
JCR *jcr;
return NULL;
}
/* Release lock due to recursion */
- PyEval_ReleaseLock();
+// PyEval_ReleaseLock();
jcr = get_jcr_from_PyObject(self);
UAContext *ua = new_ua_context(jcr);
ua->batch = true;
parse_ua_args(ua); /* parse command */
stat = run_cmd(ua, ua->cmd);
free_ua_context(ua);
- PyEval_AcquireLock();
+// PyEval_AcquireLock();
return PyInt_FromLong((long)stat);
}
}
foreach_jcr(jcr) {
if (jcr->JobId == 0) {
- free_jcr(jcr);
continue;
}
if (jcr->JobId == JobId) {
break;
}
}
+ /* endeach_jcr(jcr) not needed because freed below */
+
if (!found) {
/* ***FIXME*** raise exception */
return NULL;
}
- PyEval_ReleaseLock();
+// PyEval_ReleaseLock();
UAContext *ua = new_ua_context(jcr);
ua->batch = true;
if (!cancel_job(ua, jcr)) {
}
free_ua_context(ua);
free_jcr(jcr);
- PyEval_AcquireLock();
+// PyEval_AcquireLock();
Py_INCREF(Py_None);
return Py_None;
}
return 0;
}
- PyEval_AcquireLock();
+ lock_python();
+// PyEval_AcquireLock();
method = find_method(events, method, event);
if (!method) {
Py_XDECREF(result);
bail_out:
- PyEval_ReleaseLock();
+ unlock_python();
+// PyEval_ReleaseLock();
return stat;
}
projects / bacula / bacula / blobdiff