-/*
- * Bacula message handling routines
- *
- * Kern Sibbald, April 2000
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2010 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 plus additions
- that are listed in the file LICENSE.
+ 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.
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
+ 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.
- 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.
/*
* Bacula message handling routines
*
- * Kern Sibbald, April 2000
+ * NOTE: don't use any Jmsg or Qmsg calls within this file,
+ * except in q_msg or j_msg (setup routines),
+ * otherwise you may get into recursive calls if there are
+ * errors, and that can lead to looping or deadlocks.
*
- * Version $Id$
+ * Kern Sibbald, April 2000
*
*/
-
#include "bacula.h"
#include "jcr.h"
const char *working_directory = NULL; /* working directory path stored here */
int verbose = 0; /* increase User messages */
int debug_level = 0; /* debug level */
-time_t daemon_start_time = 0; /* Daemon start time */
+bool dbg_timestamp = false; /* print timestamp in debug output */
+bool prt_kaboom = false; /* Print kaboom output */
+utime_t daemon_start_time = 0; /* Daemon start time */
const char *version = VERSION " (" BDATE ")";
+const char *dist_name = DISTNAME " " DISTVER;
+const int beef = BEEF;
char my_name[30]; /* daemon name is stored here */
+char host_name[50]; /* host machine name */
char *exepath = (char *)NULL;
char *exename = (char *)NULL;
-int console_msg_pending = 0;
+int console_msg_pending = false;
char con_fname[500]; /* Console filename */
FILE *con_fd = NULL; /* Console file descriptor */
brwlock_t con_lock; /* Console lock structure */
-static char *catalog_db = NULL; /* database type */
+/* Forward referenced functions */
-const char *host_os = HOST_OS;
-const char *distname = DISTNAME;
-const char *distver = DISTVER;
+/* Imported functions */
+void create_jcr_key();
+
+/* Static storage */
+
+/* Allow only one thread to tweak d->fd at a time */
+static pthread_mutex_t fides_mutex = PTHREAD_MUTEX_INITIALIZER;
+static MSGS *daemon_msgs; /* global messages */
+static char *catalog_db = NULL; /* database type */
+static void (*message_callback)(int type, char *msg) = NULL;
static FILE *trace_fd = NULL;
#if defined(HAVE_WIN32)
static bool trace = true;
static bool trace = false;
#endif
-/* Forward referenced functions */
+/* Constants */
+const char *host_os = HOST_OS;
+const char *distname = DISTNAME;
+const char *distver = DISTVER;
-/* Imported functions */
+/* Some message class methods */
+void MSGS::lock()
+{
+ P(fides_mutex);
+}
+void MSGS::unlock()
+{
+ V(fides_mutex);
+}
-/* Static storage */
+/*
+ * Wait for not in use variable to be clear
+ */
+void MSGS::wait_not_in_use() /* leaves fides_mutex set */
+{
+ lock();
+ while (m_in_use) {
+ unlock();
+ bmicrosleep(0, 200); /* wait */
+ lock();
+ }
+}
-/* Used to allow only one thread close the daemon messages at a time */
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static MSGS *daemon_msgs; /* global messages */
+/*
+ * Handle message delivery errors
+ */
+static void delivery_error(const char *fmt,...)
+{
+ va_list arg_ptr;
+ int i, len, maxlen;
+ POOLMEM *pool_buf;
+ char dt[MAX_TIME_LENGTH];
+ int dtlen;
+
+ pool_buf = get_pool_memory(PM_EMSG);
+
+ bstrftime_ny(dt, sizeof(dt), time(NULL));
+ dtlen = strlen(dt);
+ dt[dtlen++] = ' ';
+ dt[dtlen] = 0;
+
+ i = Mmsg(pool_buf, "%s Message delivery ERROR: ", dt);
+
+ for (;;) {
+ maxlen = sizeof_pool_memory(pool_buf) - i - 1;
+ va_start(arg_ptr, fmt);
+ len = bvsnprintf(pool_buf+i, maxlen, fmt, arg_ptr);
+ va_end(arg_ptr);
+ if (len < 0 || len >= (maxlen-5)) {
+ pool_buf = realloc_pool_memory(pool_buf, maxlen + i + maxlen/2);
+ continue;
+ }
+ break;
+ }
+
+ fputs(pool_buf, stdout); /* print this here to INSURE that it is printed */
+ fflush(stdout);
+ syslog(LOG_DAEMON|LOG_ERR, "%s", pool_buf);
+ free_memory(pool_buf);
+}
+
+void register_message_callback(void msg_callback(int type, char *msg))
+{
+ message_callback = msg_callback;
+}
/*
* Resource record. On the second call, generally,
* argv is NULL to avoid doing the path code twice.
*/
-#define BTRACE_EXTRA 20
void my_name_is(int argc, char *argv[], const char *name)
{
char *l, *p, *q;
char cpath[1024];
int len;
+ if (gethostname(host_name, sizeof(host_name)) != 0) {
+ bstrncpy(host_name, "Hostname unknown", sizeof(host_name));
+ }
bstrncpy(my_name, name, sizeof(my_name));
if (argc>0 && argv && argv[0]) {
/* strip trailing filename and save exepath */
void
set_db_type(const char *name)
{
- if (catalog_db != NULL)
- {
+ if (catalog_db != NULL) {
free(catalog_db);
}
-
catalog_db = bstrdup(name);
}
if (jcr == NULL && msg == NULL) {
init_last_jobs_list();
+ /* Create a daemon key then set invalid jcr */
+ /* Maybe we should give the daemon a jcr??? */
+ create_jcr_key();
+ set_jcr_in_tsd(INVALID_JCR);
}
#if !defined(HAVE_WIN32)
daemon_msgs->dest_chain = temp_chain;
memcpy(daemon_msgs->send_msg, msg->send_msg, sizeof(msg->send_msg));
}
+
Dmsg2(250, "Copy message resource %p to %p\n", msg, temp_chain);
}
{
int fd;
- bsnprintf(con_fname, sizeof(con_fname), "%s/%s.conmsg", wd, my_name);
+ bsnprintf(con_fname, sizeof(con_fname), "%s%c%s.conmsg", wd, PathSeparator, my_name);
fd = open(con_fname, O_CREAT|O_RDWR|O_BINARY, 0600);
if (fd == -1) {
berrno be;
Emsg2(M_ERROR_TERM, 0, _("Could not open console message file %s: ERR=%s\n"),
- con_fname, be.strerror());
+ con_fname, be.bstrerror());
}
if (lseek(fd, 0, SEEK_END) > 0) {
console_msg_pending = 1;
if (!con_fd) {
berrno be;
Emsg2(M_ERROR, 0, _("Could not open console message file %s: ERR=%s\n"),
- con_fname, be.strerror());
+ con_fname, be.bstrerror());
}
if (rwl_init(&con_lock) != 0) {
berrno be;
Emsg1(M_ERROR_TERM, 0, _("Could not get con mutex: ERR=%s\n"),
- be.strerror());
+ be.bstrerror());
}
}
{
if (jcr) {
Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name,
- jcr->Job, (int)(long)d);
+ jcr->Job, (int)(intptr_t)d);
} else {
Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name,
- my_name, (int)(long)d);
+ my_name, (int)(intptr_t)d);
}
Dmsg1(850, "mailname=%s\n", name);
}
}
fflush(stdout);
- if (!(bpipe = open_bpipe(cmd, 120, "rw"))) {
+ if ((bpipe = open_bpipe(cmd, 120, "rw"))) {
+ /* If we had to use sendmail, add subject */
+ if (!d->mail_cmd) {
+ fprintf(bpipe->wfd, "Subject: %s\r\n\r\n", _("Bacula Message"));
+ }
+ } else {
berrno be;
- Jmsg(jcr, M_ERROR, 0, _("open mail pipe %s failed: ERR=%s\n"),
- cmd, be.strerror());
- }
-
- /* If we had to use sendmail, add subject */
- if (!d->mail_cmd) {
- fprintf(bpipe->wfd, "Subject: %s\r\n\r\n", _("Bacula Message"));
+ delivery_error(_("open mail pipe %s failed: ERR=%s\n"),
+ cmd, be.bstrerror());
}
-
return bpipe;
}
if (jcr == NULL) { /* NULL -> global chain */
msgs = daemon_msgs;
- P(mutex); /* only one thread walking the chain */
} else {
msgs = jcr->jcr_msgs;
jcr->jcr_msgs = NULL;
if (msgs == NULL) {
return;
}
+
+ /* Wait for item to be not in use, then mark closing */
+ if (msgs->is_closing()) {
+ return;
+ }
+ msgs->wait_not_in_use(); /* leaves fides_mutex set */
+ msgs->set_closing();
+ msgs->unlock();
+
Dmsg1(850, "===Begin close msg resource at %p\n", msgs);
cmd = get_pool_memory(PM_MESSAGE);
for (d=msgs->dest_chain; d; ) {
}
if (
(d->dest_code == MD_MAIL_ON_ERROR && jcr &&
- jcr->JobStatus == JS_Terminated)
+ (jcr->JobStatus == JS_Terminated || jcr->JobStatus == JS_Warnings))
||
(d->dest_code == MD_MAIL_ON_SUCCESS && jcr &&
jcr->JobStatus == JS_ErrorTerminated)
- ){
+ ) {
goto rem_temp_file;
}
}
if (!close_wpipe(bpipe)) { /* close write pipe sending mail */
berrno be;
- Pmsg1(000, _("close error: ERR=%s\n"), be.strerror());
+ Pmsg1(000, _("close error: ERR=%s\n"), be.bstrerror());
}
/*
if (msgs != daemon_msgs) {
/* read what mail prog returned -- should be nothing */
while (fgets(line, len, bpipe->rfd)) {
- Jmsg1(jcr, M_INFO, 0, _("Mail prog: %s"), line);
+ delivery_error(_("Mail prog: %s"), line);
}
}
berrno be;
be.set_errno(stat);
Dmsg1(850, "Calling emsg. CMD=%s\n", cmd);
- Jmsg2(jcr, M_ERROR, 0, _("Mail program terminated in error.\n"
- "CMD=%s\n"
- "ERR=%s\n"), cmd, be.strerror());
+ delivery_error(_("Mail program terminated in error.\n"
+ "CMD=%s\n"
+ "ERR=%s\n"), cmd, be.bstrerror());
}
free_memory(line);
rem_temp_file:
free_msgs_res(msgs);
msgs = NULL;
} else {
- V(mutex);
+ msgs->clear_closing();
}
Dmsg0(850, "===End close msg resource\n");
}
fclose(trace_fd);
trace_fd = NULL;
}
+ if (catalog_db) {
+ free(catalog_db);
+ catalog_db = NULL;
+ }
term_last_jobs_list();
}
d->fd = fopen(d->where, mode);
if (!d->fd) {
berrno be;
- d->fd = stdout;
- Qmsg2(jcr, M_ERROR, 0, _("fopen %s failed: ERR=%s\n"), d->where,
- be.strerror());
- d->fd = NULL;
+ delivery_error(_("fopen %s failed: ERR=%s\n"), d->where, be.bstrerror());
return false;
}
return true;
/*
* Handle sending the message to the appropriate place
*/
-void dispatch_message(JCR *jcr, int type, time_t mtime, char *msg)
+void dispatch_message(JCR *jcr, int type, utime_t mtime, char *msg)
{
DEST *d;
char dt[MAX_TIME_LENGTH];
int len, dtlen;
MSGS *msgs;
BPIPE *bpipe;
- char *mode;
+ const char *mode;
Dmsg2(850, "Enter dispatch_msg type=%d msg=%s", type, msg);
* Most messages are prefixed by a date and time. If mtime is
* zero, then we use the current time. If mtime is 1 (special
* kludge), we do not prefix the date and time. Otherwise,
- * we assume mtime is a time_t and use it.
+ * we assume mtime is a utime_t and use it.
*/
if (mtime == 0) {
mtime = time(NULL);
if (mtime == 1) {
*dt = 0;
dtlen = 0;
+ mtime = time(NULL); /* get time for SQL log */
} else {
bstrftime_ny(dt, sizeof(dt), mtime);
dtlen = strlen(dt);
dt[dtlen] = 0;
}
+ /* If the program registered a callback, send it there */
+ if (message_callback) {
+ message_callback(type, msg);
+ return;
+ }
+
+ /* For serious errors make sure message is printed or logged */
if (type == M_ABORT || type == M_ERROR_TERM) {
fputs(dt, stdout);
- fputs(msg, stdout); /* print this here to INSURE that it is printed */
+ fputs(msg, stdout);
fflush(stdout);
+ if (type == M_ABORT) {
+ syslog(LOG_DAEMON|LOG_ERR, "%s", msg);
+ }
}
+
/* Now figure out where to send the message */
msgs = NULL;
+ if (!jcr) {
+ jcr = get_jcr_from_tsd();
+ }
if (jcr) {
msgs = jcr->jcr_msgs;
}
if (msgs == NULL) {
msgs = daemon_msgs;
}
+ /*
+ * If closing this message resource, print and send to syslog,
+ * then get out.
+ */
+ if (msgs->is_closing()) {
+ fputs(dt, stdout);
+ fputs(msg, stdout);
+ fflush(stdout);
+ syslog(LOG_DAEMON|LOG_ERR, "%s", msg);
+ return;
+ }
+
for (d=msgs->dest_chain; d; d=d->next) {
if (bit_is_set(type, d->msg_types)) {
switch (d->dest_code) {
int len = strlen(msg) + 1;
esc_msg = check_pool_memory_size(esc_msg, len*2+1);
- p_sql_escape(esc_msg, msg, len);
+ p_sql_escape(jcr, jcr->db, esc_msg, msg, len);
bstrutime(dt, sizeof(dt), mtime);
Mmsg(cmd, "INSERT INTO Log (JobId, Time, LogText) VALUES (%s,'%s','%s')",
(void)fwrite("\n", 2, 1, con_fd);
}
fflush(con_fd);
- console_msg_pending = TRUE;
+ console_msg_pending = true;
Vw(con_lock);
}
break;
if (stat != 0) {
berrno be;
be.set_errno(stat);
- Qmsg2(jcr, M_ERROR, 0, _("Operator mail program terminated in error.\n"
+ delivery_error(_("Msg delivery error: Operator mail program terminated in error.\n"
"CMD=%s\n"
- "ERR=%s\n"), mcmd, be.strerror());
+ "ERR=%s\n"), mcmd, be.bstrerror());
}
}
free_pool_memory(mcmd);
case MD_MAIL_ON_ERROR:
case MD_MAIL_ON_SUCCESS:
Dmsg1(850, "MAIL for following msg: %s", msg);
+ if (msgs->is_closing()) {
+ break;
+ }
+ msgs->set_in_use();
if (!d->fd) {
POOLMEM *name = get_pool_memory(PM_MESSAGE);
make_unique_mail_filename(jcr, name, d);
d->fd = fopen(name, "w+b");
if (!d->fd) {
berrno be;
- d->fd = stdout;
- Qmsg2(jcr, M_ERROR, 0, _("fopen %s failed: ERR=%s\n"), name,
- be.strerror());
- d->fd = NULL;
+ delivery_error(_("Msg delivery error: fopen %s failed: ERR=%s\n"), name,
+ be.bstrerror());
free_pool_memory(name);
+ V(fides_mutex);
break;
}
d->mail_filename = name;
d->max_len = len; /* keep max line length */
}
fputs(msg, d->fd);
+ msgs->clear_in_use();
break;
case MD_APPEND:
Dmsg1(850, "APPEND for following msg: %s", msg);
Dmsg1(850, "FILE for following msg: %s", msg);
mode = "w+b";
send_to_file:
+ if (msgs->is_closing()) {
+ break;
+ }
+ msgs->set_in_use();
if (!d->fd && !open_dest_file(jcr, d, mode)) {
+ msgs->clear_in_use();
break;
}
fputs(dt, d->fd);
fputs(msg, d->fd);
}
}
+ msgs->clear_in_use();
break;
case MD_DIRECTOR:
Dmsg1(850, "DIRECTOR for following msg: %s", msg);
if (jcr && jcr->dir_bsock && !jcr->dir_bsock->errors) {
- bnet_fsend(jcr->dir_bsock, "Jmsg Job=%s type=%d level=%d %s",
+ jcr->dir_bsock->fsend("Jmsg Job=%s type=%d level=%lld %s",
jcr->Job, type, mtime, msg);
+ } else {
+ Dmsg1(800, "no jcr for following msg: %s", msg);
}
break;
case MD_STDOUT:
#endif
}
+/*
+ * print or write output to trace file
+ */
+static void pt_out(char *buf)
+{
+ /*
+ * Used the "trace on" command in the console to turn on
+ * output to the trace file. "trace off" will close the file.
+ */
+ if (trace) {
+ if (!trace_fd) {
+ char fn[200];
+ bsnprintf(fn, sizeof(fn), "%s/%s.trace", working_directory ? working_directory : "./", my_name);
+ trace_fd = fopen(fn, "a+b");
+ }
+ if (trace_fd) {
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
+ } else {
+ /* Some problem, turn off tracing */
+ trace = false;
+ }
+ } else { /* not tracing */
+ fputs(buf, stdout);
+ fflush(stdout);
+ }
+}
+
/*********************************************************************
*
* This subroutine prints a debug message if the level number
int len;
va_list arg_ptr;
bool details = true;
+ utime_t mtime;
if (level < 0) {
details = false;
}
if (level <= debug_level) {
+ if (dbg_timestamp) {
+ mtime = time(NULL);
+ bstrftimes(buf, sizeof(buf), mtime);
+ len = strlen(buf);
+ buf[len++] = ' ';
+ buf[len] = 0;
+ fputs(buf, stdout);
+ }
+
#ifdef FULL_LOCATION
if (details) {
- len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, get_basename(file), line);
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d-%u ",
+ my_name, get_basename(file), line, get_jobid_from_tsd());
} else {
len = 0;
}
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
- /*
- * Used the "trace on" command in the console to turn on
- * output to the trace file. "trace off" will close the file.
- */
- if (trace) {
- if (!trace_fd) {
- char fn[200];
- bsnprintf(fn, sizeof(fn), "%s/%s.trace", working_directory ? working_directory : ".", my_name);
- trace_fd = fopen(fn, "a+b");
- }
- if (trace_fd) {
- fputs(buf, trace_fd);
- fflush(trace_fd);
- } else {
- /* Some problem, turn off tracing */
- trace = false;
- }
- } else { /* not tracing */
- fputs(buf, stdout);
- fflush(stdout);
- }
+ pt_out(buf);
}
}
va_start(arg_ptr, fmt);
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
- fputs(buf, stdout);
- fflush(stdout);
+
+ pt_out(buf);
}
}
}
-
-
/* *********************************************************
*
* print an error message
*
*/
void
-Jmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...)
+Jmsg(JCR *jcr, int type, utime_t mtime, const char *fmt,...)
{
char rbuf[5000];
va_list arg_ptr;
int len;
MSGS *msgs;
- const char *job;
+ uint32_t JobId = 0;
Dmsg1(850, "Enter Jmsg type=%d\n", type);
dir->msglen = bvsnprintf(dir->msg, sizeof_pool_memory(dir->msg),
fmt, arg_ptr);
va_end(arg_ptr);
- bnet_send(jcr->dir_bsock);
+ jcr->dir_bsock->send();
+ return;
+ }
+
+ /* The watchdog thread can't use Jmsg directly, we always queued it */
+ if (is_watchdog()) {
+ va_start(arg_ptr, fmt);
+ bvsnprintf(rbuf, sizeof(rbuf), fmt, arg_ptr);
+ va_end(arg_ptr);
+ Qmsg(jcr, type, mtime, "%s", rbuf);
return;
}
msgs = NULL;
- job = NULL;
+ if (!jcr) {
+ jcr = get_jcr_from_tsd();
+ }
if (jcr) {
+ if (!jcr->dequeuing_msgs) { /* Avoid recursion */
+ /* Dequeue messages to keep the original order */
+ dequeue_messages(jcr);
+ }
msgs = jcr->jcr_msgs;
- job = jcr->Job;
+ JobId = jcr->JobId;
}
if (!msgs) {
msgs = daemon_msgs; /* if no jcr, we use daemon handler */
}
- if (!job) {
- job = ""; /* Set null job name if none */
- }
/*
* Check if we have a message destination defined.
len = bsnprintf(rbuf, sizeof(rbuf), _("%s ERROR TERMINATION\n"), my_name);
break;
case M_FATAL:
- len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Fatal error: "), my_name, job);
+ len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Fatal error: "), my_name, JobId);
if (jcr) {
set_jcr_job_status(jcr, JS_FatalError);
}
+ if (jcr && jcr->JobErrors == 0) {
+ jcr->JobErrors = 1;
+ }
break;
case M_ERROR:
- len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Error: "), my_name, job);
+ len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Error: "), my_name, JobId);
if (jcr) {
- jcr->Errors++;
+ jcr->JobErrors++;
}
break;
case M_WARNING:
- len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Warning: "), my_name, job);
+ len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Warning: "), my_name, JobId);
+ if (jcr) {
+ jcr->JobWarnings++;
+ }
break;
case M_SECURITY:
- len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Security violation: "), my_name, job);
+ len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Security violation: "),
+ my_name, JobId);
break;
default:
- len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s JobId %u: ", my_name, JobId);
break;
}
* If we come here, prefix the message with the file:line-number,
* then pass it on to the normal Jmsg routine.
*/
-void j_msg(const char *file, int line, JCR *jcr, int type, time_t mtime, const char *fmt,...)
+void j_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt,...)
{
va_list arg_ptr;
int i, len, maxlen;
}
-static pthread_mutex_t msg_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
-
/*
* We queue messages rather than print them directly. This
* is generally used in low level routines (msg handler, bnet)
* sending a message, it is a bit messy to recursively call
* yourself when the bnet packet is not reentrant).
*/
-void Qmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...)
+void Qmsg(JCR *jcr, int type, utime_t mtime, const char *fmt,...)
{
va_list arg_ptr;
int len, maxlen;
item->type = type;
item->mtime = time(NULL);
strcpy(item->msg, pool_buf);
- /* If no jcr or dequeuing send to daemon to avoid recursion */
- if (!jcr || jcr->dequeuing) {
- /* jcr==NULL => daemon message, safe to send now */
- Jmsg(NULL, item->type, item->mtime, "%s", item->msg);
+ if (!jcr) {
+ jcr = get_jcr_from_tsd();
+ }
+ /* If no jcr or no queue or dequeuing send to syslog */
+ if (!jcr || !jcr->msg_queue || jcr->dequeuing_msgs) {
+ syslog(LOG_DAEMON|LOG_ERR, "%s", item->msg);
free(item);
} else {
/* Queue message for later sending */
- P(msg_queue_mutex);
+ P(jcr->msg_queue_mutex);
jcr->msg_queue->append(item);
- V(msg_queue_mutex);
+ V(jcr->msg_queue_mutex);
}
free_memory(pool_buf);
}
void dequeue_messages(JCR *jcr)
{
MQUEUE_ITEM *item;
- P(msg_queue_mutex);
if (!jcr->msg_queue) {
- goto bail_out;
+ return;
}
- jcr->dequeuing = true;
+ P(jcr->msg_queue_mutex);
+ jcr->dequeuing_msgs = true;
foreach_dlist(item, jcr->msg_queue) {
Jmsg(jcr, item->type, item->mtime, "%s", item->msg);
}
+ /* Remove messages just sent */
jcr->msg_queue->destroy();
- jcr->dequeuing = false;
-
-bail_out:
- V(msg_queue_mutex);
+ jcr->dequeuing_msgs = false;
+ V(jcr->msg_queue_mutex);
}
* If we come here, prefix the message with the file:line-number,
* then pass it on to the normal Qmsg routine.
*/
-void q_msg(const char *file, int line, JCR *jcr, int type, time_t mtime, const char *fmt,...)
+void q_msg(const char *file, int line, JCR *jcr, int type, utime_t mtime, const char *fmt,...)
{
va_list arg_ptr;
int i, len, maxlen;
projects / bacula / bacula / blobdiff