#define FULL_LOCATION 1 /* set for file:line in Debug messages */
+/*
+ * This is where we define "Globals" because all the
+ * daemons include this file.
+ */
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 */
-
-char my_name[20]; /* daemon name is stored here */
+const char *version = VERSION " (" BDATE ")";
+char my_name[30]; /* daemon name is stored here */
char *exepath = (char *)NULL;
char *exename = (char *)NULL;
int console_msg_pending = 0;
FILE *con_fd = NULL; /* Console file descriptor */
brwlock_t con_lock; /* Console lock structure */
-FILE *trace_fd = NULL;
+#ifdef HAVE_POSTGRESQL
+char catalog_db[] = "PostgreSQL";
+#else
+#ifdef HAVE_MYSQL
+char catalog_db[] = "MySQL";
+#else
+#ifdef HAVE_SQLITE
+char catalog_db[] = "SQLite";
+#else
+char catalog_db[] = "Internal";
+#endif
+#endif
+#endif
+
+const char *host_os = HOST_OS;
+const char *distname = DISTNAME;
+const char *distver = DISTVER;
+static FILE *trace_fd = NULL;
+#ifdef HAVE_WIN32
+static bool trace = true;
+#else
+static bool trace = false;
+#endif
/* Forward referenced functions */
* argv is NULL to avoid doing the path code twice.
*/
#define BTRACE_EXTRA 20
-void my_name_is(int argc, char *argv[], char *name)
+void my_name_is(int argc, char *argv[], const char *name)
{
char *l, *p, *q;
char cpath[400], npath[400];
l++;
} else {
l = argv[0];
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
/* On Windows allow c: junk */
if (l[1] == ':') {
l += 2;
* non-NULL -> initialize jcr using Message resource
*/
void
-init_msg(void *vjcr, MSGS *msg)
+init_msg(JCR *jcr, MSGS *msg)
{
DEST *d, *dnew, *temp_chain = NULL;
- JCR *jcr = (JCR *)vjcr;
+ int i;
+ if (jcr == NULL && msg == NULL) {
+ init_last_jobs_list();
+ }
+
+#ifndef HAVE_WIN32
+ /*
+ * Make sure we have fd's 0, 1, 2 open
+ * If we don't do this one of our sockets may open
+ * there and if we then use stdout, it could
+ * send total garbage to our socket.
+ *
+ */
+ int fd;
+ fd = open("/dev/null", O_RDONLY, 0644);
+ if (fd > 2) {
+ close(fd);
+ } else {
+ for(i=1; fd + i <= 2; i++) {
+ dup2(fd, fd+i);
+ }
+ }
+
+#endif
/*
* If msg is NULL, initialize global chain for STDOUT and syslog
*/
if (msg == NULL) {
- int i;
daemon_msgs = (MSGS *)malloc(sizeof(MSGS));
memset(daemon_msgs, 0, sizeof(MSGS));
for (i=1; i<=M_MAX; i++) {
jcr->Job, fd);
}
-int open_spool_file(void *vjcr, BSOCK *bs)
+int open_spool_file(JCR *jcr, BSOCK *bs)
{
POOLMEM *name = get_pool_memory(PM_MESSAGE);
- JCR *jcr = (JCR *)vjcr;
make_unique_spool_filename(jcr, &name, bs->fd);
- bs->spool_fd = fopen(name, "w+");
+ bs->spool_fd = fopen(mp_chr(name), "w+");
if (!bs->spool_fd) {
Jmsg(jcr, M_ERROR, 0, "fopen spool file %s failed: ERR=%s\n", name, strerror(errno));
free_pool_memory(name);
return 1;
}
-int close_spool_file(void *vjcr, BSOCK *bs)
+int close_spool_file(JCR *jcr, BSOCK *bs)
{
POOLMEM *name = get_pool_memory(PM_MESSAGE);
- JCR *jcr = (JCR *)vjcr;
make_unique_spool_filename(jcr, &name, bs->fd);
fclose(bs->spool_fd);
- unlink(name);
+ unlink(mp_chr(name));
free_pool_memory(name);
bs->spool_fd = NULL;
bs->spool = 0;
fflush(stdout);
if (!(bpipe = open_bpipe(*cmd, 120, "rw"))) {
- Jmsg(jcr, M_ERROR, 0, "open mail pipe %s failed: ERR=%s\n", *cmd, strerror(errno));
+ Jmsg(jcr, M_ERROR, 0, "open mail pipe %s failed: ERR=%s\n",
+ *cmd, strerror(errno));
}
return bpipe;
}
* Close the messages for this Messages resource, which means to close
* any open files, and dispatch any pending email messages.
*/
-void close_msg(void *vjcr)
+void close_msg(JCR *jcr)
{
MSGS *msgs;
- JCR *jcr = (JCR *)vjcr;
DEST *d;
BPIPE *bpipe;
POOLMEM *cmd, *line;
}
if (!(bpipe=open_mail_pipe(jcr, &cmd, d))) {
- Dmsg0(000, "open mail pipe failed.\n");
+ Pmsg0(000, "open mail pipe failed.\n");
goto rem_temp_file;
}
Dmsg0(150, "Opened mail pipe\n");
len = d->max_len+10;
line = get_memory(len);
rewind(d->fd);
- while (fgets(line, len, d->fd)) {
+ while (fgets(mp_chr(line), len, d->fd)) {
fputs(line, bpipe->wfd);
}
if (!close_wpipe(bpipe)) { /* close write pipe sending mail */
- Dmsg1(000, "close error: ERR=%s\n", strerror(errno));
+ Pmsg1(000, "close error: ERR=%s\n", strerror(errno));
}
/*
*/
if (msgs != daemon_msgs) {
/* read what mail prog returned -- should be nothing */
- while (fgets(line, len, bpipe->rfd)) {
+ while (fgets(mp_chr(line), len, bpipe->rfd)) {
Jmsg1(jcr, M_INFO, 0, _("Mail prog: %s"), line);
}
}
stat = close_bpipe(bpipe);
if (stat != 0 && msgs != daemon_msgs) {
Dmsg1(150, "Calling emsg. CMD=%s\n", cmd);
- Jmsg2(jcr, M_ERROR, 0, _("Mail program terminated in error. stat=%d\n"
- "CMD=%s\n"), stat, cmd);
+ Jmsg3(jcr, M_ERROR, 0, _("Mail program terminated in error. stat=%d\n"
+ "CMD=%s\n"
+ "ERR=%s\n"), stat, cmd, strerror(stat));
}
free_memory(line);
rem_temp_file:
/* Remove temp file */
fclose(d->fd);
- unlink(d->mail_filename);
+ unlink(mp_chr(d->mail_filename));
free_pool_memory(d->mail_filename);
d->mail_filename = NULL;
Dmsg0(150, "end mail or mail on error\n");
fclose(trace_fd);
trace_fd = NULL;
}
+ term_last_jobs_list();
}
/*
* Handle sending the message to the appropriate place
*/
-void dispatch_message(void *vjcr, int type, int level, char *msg)
+void dispatch_message(JCR *jcr, int type, int level, char *msg)
{
DEST *d;
char dt[MAX_TIME_LENGTH];
POOLMEM *mcmd;
- JCR *jcr = (JCR *) vjcr;
int len;
MSGS *msgs;
BPIPE *bpipe;
if (type == M_ABORT || type == M_ERROR_TERM) {
fputs(msg, stdout); /* print this here to INSURE that it is printed */
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+ MessageBox(NULL, msg, "Bacula", MB_OK);
+#endif
}
/* Now figure out where to send the message */
/* Messages to the operator go one at a time */
stat = close_bpipe(bpipe);
if (stat != 0) {
- Emsg1(M_ERROR, 0, _("Operator mail program terminated in error.\nCMD=%s\n"),
- mcmd);
+ Jmsg2(jcr, M_ERROR, 0, _("Operator mail program terminated in error.\n"
+ "CMD=%s\n"
+ "ERR=%s\n"), mcmd, strerror(stat));
}
}
free_pool_memory(mcmd);
case MD_MAIL_ON_ERROR:
Dmsg1(800, "MAIL for following msg: %s", msg);
if (!d->fd) {
- POOLMEM *name = get_pool_memory(PM_MESSAGE);
- make_unique_mail_filename(jcr, &name, d);
- d->fd = fopen(name, "w+");
+ POOLMEM *name = get_pool_memory(PM_MESSAGE);
+ make_unique_mail_filename(jcr, &mp_chr(name), d);
+ d->fd = fopen(mp_chr(name), "w+");
if (!d->fd) {
d->fd = stdout;
- Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", name, strerror(errno));
+ Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", name, strerror(errno));
d->fd = NULL;
free_pool_memory(name);
break;
d->fd = fopen(d->where, "w+");
if (!d->fd) {
d->fd = stdout;
- Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
+ Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
d->fd = NULL;
break;
}
d->fd = fopen(d->where, "a");
if (!d->fd) {
d->fd = stdout;
- Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
+ Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
d->fd = NULL;
break;
}
case MD_DIRECTOR:
Dmsg1(800, "DIRECTOR for following msg: %s", msg);
if (jcr && jcr->dir_bsock && !jcr->dir_bsock->errors) {
-
- jcr->dir_bsock->msglen = Mmsg(&(jcr->dir_bsock->msg),
- "Jmsg Job=%s type=%d level=%d %s", jcr->Job,
- type, level, msg) + 1;
- bnet_send(jcr->dir_bsock);
+ bnet_fsend(jcr->dir_bsock, "Jmsg Job=%s type=%d level=%d %s",
+ jcr->Job, type, level, msg);
}
break;
case MD_STDOUT:
/*********************************************************************
*
- * subroutine prints a debug message if the level number
+ * This subroutine prints a debug message if the level number
* is less than or equal the debug_level. File and line numbers
* are included for more detail if desired, but not currently
* printed.
* are not printed.
*/
void
-d_msg(char *file, int line, int level, char *fmt,...)
+d_msg(const char *file, int line, int level, const char *fmt,...)
{
char buf[5000];
int len;
if (level < 0) {
details = FALSE;
-// level = -level;
- level = 0;
+ level = -level;
}
if (level <= debug_level) {
-#ifdef SEND_DMSG_TO_FILE
- if (!trace_fd) {
- bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
- trace_fd = fopen(buf, "a+");
- if (!trace_fd) {
- Emsg2(M_ABORT, 0, _("Cannot open %s: ERR=%s\n"),
- buf, strerror(errno));
- }
- }
-#endif
#ifdef FULL_LOCATION
if (details) {
- len= sprintf(buf, "%s: %s:%d ", my_name, file, line);
+ /* visual studio passes the whole path to the file as well
+ * which makes for very long lines
+ */
+ char *f = strrchr(file, '\\');
+ if (f) file = f + 1;
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
} else {
len = 0;
}
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
-#ifdef SEND_DMSG_TO_FILE
- fputs(buf, trace_fd);
- fflush(trace_fd);
+ /*
+ * 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) {
+ bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory ? working_directory : ".");
+ trace_fd = fopen(buf, "a+");
+ }
+ if (trace_fd) {
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
+ }
+ } else { /* not tracing */
+ fputs(buf, stdout);
+ }
+ }
+}
+
+/*
+ * Set trace flag on/off. If argument is negative, there is no change
+ */
+void set_trace(int trace_flag)
+{
+ if (trace_flag < 0) {
+ return;
+ } else if (trace_flag > 0) {
+ trace = true;
+ } else {
+ trace = false;
+ }
+ if (!trace && trace_fd) {
+ FILE *ltrace_fd = trace_fd;
+ trace_fd = NULL;
+ bmicrosleep(0, 100000); /* yield to prevent seg faults */
+ fclose(ltrace_fd);
+ }
+}
+
+/*********************************************************************
+ *
+ * This subroutine prints a message regardless of the debug level
+ *
+ * If the level is negative, the details of file and line number
+ * are not printed.
+ */
+void
+p_msg(const char *file, int line, int level, const char *fmt,...)
+{
+ char buf[5000];
+ int len;
+ va_list arg_ptr;
+
+#ifdef FULL_LOCATION
+ if (level >= 0) {
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
+ } else {
+ len = 0;
+ }
#else
- fputs(buf, stdout);
+ len = 0;
#endif
- }
+ va_start(arg_ptr, fmt);
+ bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
+ va_end(arg_ptr);
+ fputs(buf, stdout);
}
* are not printed.
*/
void
-t_msg(char *file, int line, int level, char *fmt,...)
+t_msg(const char *file, int line, int level, const char *fmt,...)
{
char buf[5000];
int len;
va_list arg_ptr;
int details = TRUE;
- return;
-
if (level < 0) {
details = FALSE;
level = -level;
if (!trace_fd) {
bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
trace_fd = fopen(buf, "a+");
- if (!trace_fd) {
- Emsg2(M_ABORT, 0, _("Cannot open %s: ERR=%s\n"),
- buf, strerror(errno));
- }
}
#ifdef FULL_LOCATION
if (details) {
- len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
} else {
len = 0;
}
va_start(arg_ptr, fmt);
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
-
- fputs(buf, trace_fd);
- fflush(trace_fd);
- }
+ if (trace_fd != NULL) {
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
+ }
+ }
}
*
*/
void
-e_msg(char *file, int line, int type, int level, char *fmt,...)
+e_msg(const char *file, int line, int type, int level, const char *fmt,...)
{
char buf[5000];
va_list arg_ptr;
return; /* no destination */
}
switch (type) {
- case M_ABORT:
- len = sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n",
- my_name, file, line);
- break;
- case M_ERROR_TERM:
- len = sprintf(buf, "%s: ERROR TERMINATION at %s:%d\n",
- my_name, file, line);
- break;
- case M_FATAL:
- if (level == -1) /* skip details */
- len = sprintf(buf, "%s: Fatal Error because: ", my_name);
- else
- len = sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
- break;
- case M_ERROR:
- if (level == -1) /* skip details */
- len = sprintf(buf, "%s: Error: ", my_name);
- else
- len = sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
- break;
- case M_WARNING:
- len = sprintf(buf, "%s: Warning: ", my_name);
- break;
- default:
- len = sprintf(buf, "%s: ", my_name);
- break;
+ case M_ABORT:
+ len = bsnprintf(buf, sizeof(buf), "%s: ABORTING due to ERROR in %s:%d\n",
+ my_name, file, line);
+ break;
+ case M_ERROR_TERM:
+ len = bsnprintf(buf, sizeof(buf), "%s: ERROR TERMINATION at %s:%d\n",
+ my_name, file, line);
+ break;
+ case M_FATAL:
+ if (level == -1) /* skip details */
+ len = bsnprintf(buf, sizeof(buf), "%s: Fatal Error because: ", my_name);
+ else
+ len = bsnprintf(buf, sizeof(buf), "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
+ break;
+ case M_ERROR:
+ if (level == -1) /* skip details */
+ len = bsnprintf(buf, sizeof(buf), "%s: Error: ", my_name);
+ else
+ len = bsnprintf(buf, sizeof(buf), "%s: Error in %s:%d ", my_name, file, line);
+ break;
+ case M_WARNING:
+ len = bsnprintf(buf, sizeof(buf), "%s: Warning: ", my_name);
+ break;
+ case M_SECURITY:
+ len = bsnprintf(buf, sizeof(buf), "%s: Security violation: ", my_name);
+ break;
+ default:
+ len = bsnprintf(buf, sizeof(buf), "%s: ", my_name);
+ break;
}
va_start(arg_ptr, fmt);
p[0] = 0; /* generate segmentation violation */
}
if (type == M_ERROR_TERM) {
- _exit(1);
+ exit(1);
}
}
*
*/
void
-Jmsg(void *vjcr, int type, int level, char *fmt,...)
+Jmsg(JCR *jcr, int type, int level, const char *fmt,...)
{
char rbuf[5000];
va_list arg_ptr;
int len;
- JCR *jcr = (JCR *)vjcr;
MSGS *msgs;
- char *job;
+ const char *job;
Dmsg1(800, "Enter Jmsg type=%d\n", type);
+ /* Special case for the console, which has a dir_bsock and JobId==0,
+ * in that case, we send the message directly back to the
+ * dir_bsock.
+ */
+ if (jcr && jcr->JobId == 0 && jcr->dir_bsock) {
+ BSOCK *dir = jcr->dir_bsock;
+ va_start(arg_ptr, fmt);
+ dir->msglen = bvsnprintf(mp_chr(dir->msg), sizeof_pool_memory(dir->msg),
+ fmt, arg_ptr);
+ va_end(arg_ptr);
+ bnet_send(jcr->dir_bsock);
+ return;
+ }
+
msgs = NULL;
job = NULL;
if (jcr) {
return; /* no destination */
}
switch (type) {
- case M_ABORT:
- len = sprintf(rbuf, "%s ABORTING due to ERROR\n", my_name);
- break;
- case M_ERROR_TERM:
- len = sprintf(rbuf, "%s ERROR TERMINATION\n", my_name);
- break;
- case M_FATAL:
- len = sprintf(rbuf, "%s: %s Fatal error: ", my_name, job);
- if (jcr) {
- set_jcr_job_status(jcr, JS_FatalError);
- }
- break;
- case M_ERROR:
- len = sprintf(rbuf, "%s: %s Error: ", my_name, job);
- if (jcr) {
- jcr->Errors++;
- }
- break;
- case M_WARNING:
- len = sprintf(rbuf, "%s: %s Warning: ", my_name, job);
- break;
- default:
- len = sprintf(rbuf, "%s: ", my_name);
- break;
+ case M_ABORT:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s ABORTING due to ERROR\n", my_name);
+ break;
+ case M_ERROR_TERM:
+ 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);
+ if (jcr) {
+ set_jcr_job_status(jcr, JS_FatalError);
+ }
+ break;
+ case M_ERROR:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Error: ", my_name, job);
+ if (jcr) {
+ jcr->Errors++;
+ }
+ break;
+ case M_WARNING:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Warning: ", my_name, job);
+ break;
+ case M_SECURITY:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Security violation: ", my_name, job);
+ break;
+ default:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
+ break;
}
va_start(arg_ptr, fmt);
p[0] = 0; /* generate segmentation violation */
}
if (type == M_ERROR_TERM) {
- _exit(1);
+ exit(1);
}
}
+/*
+ * 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, int level, const char *fmt,...)
+{
+ va_list arg_ptr;
+ int i, len, maxlen;
+ POOLMEM *pool_buf;
+
+ pool_buf = get_pool_memory(PM_EMSG);
+ i = Mmsg(&pool_buf, "%s:%d ", file, line);
+
+again:
+ 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) {
+ pool_buf = realloc_pool_memory(pool_buf, maxlen + i + maxlen/2);
+ goto again;
+ }
+
+ Jmsg(jcr, type, level, "%s", pool_buf);
+ free_memory(pool_buf);
+}
+
+
/*
* Edit a message into a Pool memory buffer, with file:lineno
*/
-int m_msg(char *file, int line, POOLMEM **pool_buf, char *fmt, ...)
+int m_msg(const char *file, int line, POOLMEM **pool_buf, const char *fmt, ...)
{
va_list arg_ptr;
int i, len, maxlen;
- i = sprintf(*pool_buf, "%s:%d ", file, line);
+ i = sprintf(mp_chr(*pool_buf), "%s:%d ", file, line);
again:
maxlen = sizeof_pool_memory(*pool_buf) - i - 1;
len = bvsnprintf(*pool_buf+i, maxlen, fmt, arg_ptr);
va_end(arg_ptr);
if (len < 0 || len >= maxlen) {
- *pool_buf = realloc_pool_memory(*pool_buf, maxlen + i + 200);
+ *pool_buf = realloc_pool_memory(*pool_buf, maxlen + i + maxlen/2);
goto again;
}
return len;
* Edit a message into a Pool Memory buffer NO file:lineno
* Returns: string length of what was edited.
*/
-int Mmsg(POOLMEM **pool_buf, char *fmt, ...)
+int Mmsg(POOLMEM **pool_buf, const char *fmt, ...)
{
va_list arg_ptr;
int len, maxlen;
len = bvsnprintf(*pool_buf, maxlen, fmt, arg_ptr);
va_end(arg_ptr);
if (len < 0 || len >= maxlen) {
- *pool_buf = realloc_pool_memory(*pool_buf, maxlen + 200);
+ *pool_buf = realloc_pool_memory(*pool_buf, maxlen + maxlen/2);
goto again;
}
return len;
}
+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)
+ * to prevent recursion.
+ */
+void Qmsg(JCR *jcr, int type, int level, const char *fmt,...)
+{
+ va_list arg_ptr;
+ int len, maxlen;
+ POOLMEM *pool_buf;
+ MQUEUE_ITEM *item;
+
+ if (jcr->dequeuing) { /* do not allow recursion */
+ return;
+ }
+ pool_buf = get_pool_memory(PM_EMSG);
+
+again:
+ maxlen = sizeof_pool_memory(pool_buf) - 1;
+ va_start(arg_ptr, fmt);
+ len = bvsnprintf(pool_buf, maxlen, fmt, arg_ptr);
+ va_end(arg_ptr);
+ if (len < 0 || len >= maxlen) {
+ pool_buf = realloc_pool_memory(pool_buf, maxlen + maxlen/2);
+ goto again;
+ }
+ P(msg_queue_mutex);
+ item = (MQUEUE_ITEM *)malloc(sizeof(MQUEUE_ITEM) + strlen(pool_buf) + 1);
+ item->type = type;
+ item->level = level;
+ strcpy(item->msg, pool_buf);
+ jcr->msg_queue->append(item);
+ V(msg_queue_mutex);
+ free_memory(pool_buf);
+}
+
+/*
+ * Dequeue messages
+ */
+void dequeue_messages(JCR *jcr)
+{
+ MQUEUE_ITEM *item;
+ P(msg_queue_mutex);
+ jcr->dequeuing = true;
+ foreach_dlist(item, jcr->msg_queue) {
+ Jmsg(jcr, item->type, item->level, "%s", item->msg);
+ }
+ jcr->msg_queue->destroy();
+ jcr->dequeuing = false;
+ V(msg_queue_mutex);
+}
+
/*
* If we come here, prefix the message with the file:line-number,
- * then pass it on to the normal Jmsg routine.
+ * then pass it on to the normal Qmsg routine.
*/
-void j_msg(char *file, int line, void *jcr, int type, int level, char *fmt,...)
+void q_msg(const char *file, int line, JCR *jcr, int type, int level, const char *fmt,...)
{
va_list arg_ptr;
int i, len, maxlen;
POOLMEM *pool_buf;
pool_buf = get_pool_memory(PM_EMSG);
- i = sprintf(pool_buf, "%s:%d ", file, line);
+ i = Mmsg(&pool_buf, "%s:%d ", file, line);
again:
maxlen = sizeof_pool_memory(pool_buf) - i - 1;
len = bvsnprintf(pool_buf+i, maxlen, fmt, arg_ptr);
va_end(arg_ptr);
if (len < 0 || len >= maxlen) {
- pool_buf = realloc_pool_memory(pool_buf, maxlen + i + 200);
+ pool_buf = realloc_pool_memory(pool_buf, maxlen + i + maxlen/2);
goto again;
}
- Jmsg(jcr, type, level, "%s", pool_buf);
+ Qmsg(jcr, type, level, "%s", pool_buf);
free_memory(pool_buf);
}
projects / bacula / bacula / blobdiff