*
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-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
- version 2 as ammended with additional clauses defined in the
+ version 2 as amended with additional clauses defined in the
file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
#include "bacula.h"
#include "jcr.h"
-#if !defined(HAVE_CONSOLE)
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-#include <windows.h>
-#endif
-#endif
+sql_query p_sql_query = NULL;
#define FULL_LOCATION 1 /* set for file:line in Debug messages */
FILE *con_fd = NULL; /* Console file descriptor */
brwlock_t con_lock; /* Console lock structure */
-#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
+static char *catalog_db = NULL; /* database type */
const char *host_os = HOST_OS;
const char *distname = DISTNAME;
const char *distver = DISTVER;
static FILE *trace_fd = NULL;
-#ifdef HAVE_WIN32
+#if defined(HAVE_WIN32)
static bool trace = true;
#else
static bool trace = false;
l++;
} else {
l = argv[0];
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
+#if defined(HAVE_WIN32)
/* On Windows allow c: junk */
if (l[1] == ':') {
l += 2;
}
}
+const char *
+get_db_type(void)
+{
+ return catalog_db != NULL ? catalog_db : "unknown";
+}
+
+void
+set_db_type(const char *name)
+{
+ if (catalog_db != NULL)
+ {
+ free(catalog_db);
+ }
+
+ catalog_db = bstrdup(name);
+}
+
/*
* Initialize message handler for a daemon or a Job
* We make a copy of the MSGS resource passed, so it belows
init_msg(JCR *jcr, MSGS *msg)
{
DEST *d, *dnew, *temp_chain = NULL;
- int i;
if (jcr == NULL && msg == NULL) {
init_last_jobs_list();
}
-#ifndef HAVE_WIN32
+#if !defined(HAVE_WIN32)
/*
* Make sure we have fd's 0, 1, 2 open
* If we don't do this one of our sockets may open
*
*/
int fd;
+ int i;
fd = open("/dev/null", O_RDONLY, 0644);
if (fd > 2) {
close(fd);
if (msg == NULL) {
daemon_msgs = (MSGS *)malloc(sizeof(MSGS));
memset(daemon_msgs, 0, sizeof(MSGS));
+#if !defined(HAVE_WIN32)
for (i=1; i<=M_MAX; i++) {
-#ifndef WIN32
add_msg_dest(daemon_msgs, MD_STDOUT, i, NULL, NULL);
-#endif
- add_msg_dest(daemon_msgs, MD_SYSLOG, i, NULL, NULL);
}
- Dmsg1(050, "Create daemon global message resource 0x%x\n", daemon_msgs);
+#endif
+ Dmsg1(050, "Create daemon global message resource %p\n", daemon_msgs);
return;
}
daemon_msgs->dest_chain = temp_chain;
memcpy(daemon_msgs->send_msg, msg->send_msg, sizeof(msg->send_msg));
}
- Dmsg2(250, "Copy message resource 0x%x to 0x%x\n", msg, temp_chain);
+ Dmsg2(250, "Copy message resource %p to %p\n", msg, temp_chain);
}
console_msg_pending = 1;
}
close(fd);
- con_fd = fopen(con_fname, "a+");
+ con_fd = fopen(con_fname, "a+b");
if (!con_fd) {
berrno be;
Emsg2(M_ERROR, 0, _("Could not open console message file %s: ERR=%s\n"),
for (d=msg->dest_chain; d; d=d->next) {
if (dest_code == d->dest_code && ((where == NULL && d->where == NULL) ||
(strcmp(where, d->where) == 0))) {
- Dmsg4(850, "Add to existing d=%x msgtype=%d destcode=%d where=%s\n",
+ Dmsg4(850, "Add to existing d=%p msgtype=%d destcode=%d where=%s\n",
d, msg_type, dest_code, NPRT(where));
set_bit(msg_type, d->msg_types);
set_bit(msg_type, msg->send_msg); /* set msg_type bit in our local */
if (mail_cmd) {
d->mail_cmd = bstrdup(mail_cmd);
}
- Dmsg5(850, "add new d=%x msgtype=%d destcode=%d where=%s mailcmd=%s\n",
+ Dmsg5(850, "add new d=%p msgtype=%d destcode=%d where=%s mailcmd=%s\n",
d, msg_type, dest_code, NPRT(where), NPRT(d->mail_cmd));
msg->dest_chain = d;
}
DEST *d;
for (d=msg->dest_chain; d; d=d->next) {
- Dmsg2(850, "Remove_msg_dest d=%x where=%s\n", d, NPRT(d->where));
+ Dmsg2(850, "Remove_msg_dest d=%p where=%s\n", d, NPRT(d->where));
if (bit_is_set(msg_type, d->msg_types) && (dest_code == d->dest_code) &&
((where == NULL && d->where == NULL) ||
(strcmp(where, d->where) == 0))) {
- Dmsg3(850, "Found for remove d=%x msgtype=%d destcode=%d\n",
+ Dmsg3(850, "Found for remove d=%p msgtype=%d destcode=%d\n",
d, msg_type, dest_code);
clear_bit(msg_type, d->msg_types);
Dmsg0(850, "Return rem_msg_dest\n");
static void make_unique_mail_filename(JCR *jcr, POOLMEM *&name, DEST *d)
{
if (jcr) {
- Mmsg(name, "%s/%s.mail.%s.%d", working_directory, my_name,
+ Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name,
jcr->Job, (int)(long)d);
} else {
- Mmsg(name, "%s/%s.mail.%s.%d", working_directory, my_name,
+ Mmsg(name, "%s/%s.%s.%d.mail", working_directory, my_name,
my_name, (int)(long)d);
}
Dmsg1(850, "mailname=%s\n", name);
if (!(bpipe = open_bpipe(cmd, 120, "rw"))) {
berrno be;
- Jmsg(jcr, M_ERROR, 0, "open mail pipe %s failed: ERR=%s\n",
+ 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: Bacula Message\r\n\r\n");
+ fprintf(bpipe->wfd, "Subject: %s\r\n\r\n", _("Bacula Message"));
}
return bpipe;
POOLMEM *cmd, *line;
int len, stat;
- Dmsg1(850, "Close_msg jcr=0x%x\n", jcr);
+ Dmsg1(580, "Close_msg jcr=%p\n", jcr);
if (jcr == NULL) { /* NULL -> global chain */
msgs = daemon_msgs;
if (msgs == NULL) {
return;
}
- Dmsg1(850, "===Begin close msg resource at 0x%x\n", msgs);
+ Dmsg1(850, "===Begin close msg resource at %p\n", msgs);
cmd = get_pool_memory(PM_MESSAGE);
for (d=msgs->dest_chain; d; ) {
if (d->fd) {
}
if (!(bpipe=open_mail_pipe(jcr, cmd, d))) {
- Pmsg0(000, "open mail pipe failed.\n");
+ Pmsg0(000, _("open mail pipe failed.\n"));
goto rem_temp_file;
}
Dmsg0(850, "Opened mail pipe\n");
}
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.strerror());
}
/*
term_last_jobs_list();
}
-
+static bool open_dest_file(JCR *jcr, DEST *d, const char *mode)
+{
+ 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;
+ return false;
+ }
+ return true;
+}
/*
* Handle sending the message to the appropriate place
int len, dtlen;
MSGS *msgs;
BPIPE *bpipe;
+ char *mode;
Dmsg2(850, "Enter dispatch_msg type=%d msg=%s", type, msg);
}
if (type == M_ABORT || type == M_ERROR_TERM) {
-#ifndef HAVE_WIN32
+#if !defined(HAVE_WIN32)
fputs(dt, stdout);
fputs(msg, stdout); /* print this here to INSURE that it is printed */
fflush(stdout);
for (d=msgs->dest_chain; d; d=d->next) {
if (bit_is_set(type, d->msg_types)) {
switch (d->dest_code) {
+ case MD_CATALOG:
+ char ed1[50];
+ if (!jcr || !jcr->db) {
+ break;
+ }
+ if (p_sql_query) {
+ POOL_MEM cmd(PM_MESSAGE);
+ bstrftimes(dt, sizeof(dt), mtime);
+ Mmsg(cmd, "INSERT INTO Log (JobId, Time, LogText) VALUES (%s,'%s','%s')",
+ edit_int64(jcr->JobId, ed1), dt, msg);
+ p_sql_query(jcr, cmd.c_str());
+ }
+ break;
case MD_CONSOLE:
Dmsg1(850, "CONSOLE for following msg: %s", msg);
if (!con_fd) {
- con_fd = fopen(con_fname, "a+");
+ con_fd = fopen(con_fname, "a+b");
Dmsg0(850, "Console file not open.\n");
}
if (con_fd) {
Pw(con_lock); /* get write lock on console message file */
errno = 0;
if (dtlen) {
- fwrite(dt, dtlen, 1, con_fd);
+ (void)fwrite(dt, dtlen, 1, con_fd);
}
len = strlen(msg);
if (len > 0) {
- fwrite(msg, len, 1, con_fd);
+ (void)fwrite(msg, len, 1, con_fd);
if (msg[len-1] != '\n') {
- fwrite("\n", 2, 1, con_fd);
+ (void)fwrite("\n", 2, 1, con_fd);
}
} else {
- fwrite("\n", 2, 1, con_fd);
+ (void)fwrite("\n", 2, 1, con_fd);
}
fflush(con_fd);
console_msg_pending = TRUE;
}
break;
case MD_SYSLOG:
- Dmsg1(850, "SYSLOG for collowing msg: %s\n", msg);
+ Dmsg1(850, "SYSLOG for following msg: %s\n", msg);
/*
* We really should do an openlog() here.
*/
if (!d->fd) {
POOLMEM *name = get_pool_memory(PM_MESSAGE);
make_unique_mail_filename(jcr, name, d);
- d->fd = fopen(name, "w+");
+ 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,
+ Qmsg2(jcr, M_ERROR, 0, _("fopen %s failed: ERR=%s\n"), name,
be.strerror());
d->fd = NULL;
free_pool_memory(name);
}
fputs(msg, d->fd);
break;
+ case MD_APPEND:
+ Dmsg1(850, "APPEND for following msg: %s", msg);
+ mode = "ab";
+ goto send_to_file;
case MD_FILE:
Dmsg1(850, "FILE for following msg: %s", msg);
- if (!d->fd) {
- d->fd = fopen(d->where, "w+");
- 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;
- break;
- }
+ mode = "w+b";
+send_to_file:
+ if (!d->fd && !open_dest_file(jcr, d, mode)) {
+ break;
}
fputs(dt, d->fd);
fputs(msg, d->fd);
- break;
- case MD_APPEND:
- Dmsg1(850, "APPEND for following msg: %s", msg);
- if (!d->fd) {
- d->fd = fopen(d->where, "a");
- 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;
- break;
+ /* On error, we close and reopen to handle log rotation */
+ if (ferror(d->fd)) {
+ fclose(d->fd);
+ if (open_dest_file(jcr, d, mode)) {
+ fputs(dt, d->fd);
+ fputs(msg, d->fd);
}
}
- fputs(dt, d->fd);
- fputs(msg, d->fd);
break;
case MD_DIRECTOR:
Dmsg1(850, "DIRECTOR for following msg: %s", msg);
}
}
+/*********************************************************************
+ *
+ * This subroutine returns the filename portion of a Windows
+ * path. It is used because Microsoft Visual Studio sets __FILE__
+ * to the full path.
+ */
+
+inline const char *
+get_basename(const char *pathname)
+{
+#if defined(_MSC_VER)
+ const char *basename;
+
+ if ((basename = strrchr(pathname, '\\')) == NULL) {
+ basename = pathname;
+ } else {
+ basename++;
+ }
+
+ return basename;
+#else
+ return pathname;
+#endif
+}
/*********************************************************************
*
if (level <= debug_level) {
#ifdef FULL_LOCATION
if (details) {
- /* visual studio passes the whole path to the file as well
- * which makes for very long lines
- */
- const char *f = strrchr(file, '\\');
- if (f) file = f + 1;
- len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, get_basename(file), line);
} else {
len = 0;
}
if (!trace_fd) {
char fn[200];
bsnprintf(fn, sizeof(fn), "%s/bacula.trace", working_directory ? working_directory : ".");
- trace_fd = fopen(fn, "a+");
+ trace_fd = fopen(fn, "a+b");
}
if (trace_fd) {
fputs(buf, trace_fd);
#ifdef FULL_LOCATION
if (level >= 0) {
- len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, get_basename(file), line);
} else {
len = 0;
}
if (level <= debug_level) {
if (!trace_fd) {
bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
- trace_fd = fopen(buf, "a+");
+ trace_fd = fopen(buf, "a+b");
}
#ifdef FULL_LOCATION
if (details) {
- len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, get_basename(file), line);
} else {
len = 0;
}
}
switch (type) {
case M_ABORT:
- len = bsnprintf(buf, sizeof(buf), "%s: ABORTING due to ERROR in %s:%d\n",
- my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), _("%s: ABORTING due to ERROR in %s:%d\n"),
+ my_name, get_basename(file), line);
break;
case M_ERROR_TERM:
- len = bsnprintf(buf, sizeof(buf), "%s: ERROR TERMINATION at %s:%d\n",
- my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), _("%s: ERROR TERMINATION at %s:%d\n"),
+ my_name, get_basename(file), line);
break;
case M_FATAL:
if (level == -1) /* skip details */
- len = bsnprintf(buf, sizeof(buf), "%s: Fatal Error because: ", my_name);
+ 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);
+ len = bsnprintf(buf, sizeof(buf), _("%s: Fatal Error at %s:%d because:\n"), my_name, get_basename(file), line);
break;
case M_ERROR:
if (level == -1) /* skip details */
- len = bsnprintf(buf, sizeof(buf), "%s: ERROR: ", my_name);
+ len = bsnprintf(buf, sizeof(buf), _("%s: ERROR: "), my_name);
else
- len = bsnprintf(buf, sizeof(buf), "%s: ERROR in %s:%d ", my_name, file, line);
+ len = bsnprintf(buf, sizeof(buf), _("%s: ERROR in %s:%d "), my_name, get_basename(file), line);
break;
case M_WARNING:
- len = bsnprintf(buf, sizeof(buf), "%s: Warning: ", my_name);
+ len = bsnprintf(buf, sizeof(buf), _("%s: Warning: "), my_name);
break;
case M_SECURITY:
- len = bsnprintf(buf, sizeof(buf), "%s: Security violation: ", my_name);
+ len = bsnprintf(buf, sizeof(buf), _("%s: Security violation: "), my_name);
break;
default:
len = bsnprintf(buf, sizeof(buf), "%s: ", my_name);
}
switch (type) {
case M_ABORT:
- len = bsnprintf(rbuf, sizeof(rbuf), "%s ABORTING due to ERROR\n", my_name);
+ 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);
+ 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: %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);
+ 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);
+ 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);
+ len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Security violation: "), my_name, job);
break;
default:
len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
POOLMEM *pool_buf;
pool_buf = get_pool_memory(PM_EMSG);
- i = Mmsg(pool_buf, "%s:%d ", file, line);
+ i = Mmsg(pool_buf, "%s:%d ", get_basename(file), line);
for (;;) {
maxlen = sizeof_pool_memory(pool_buf) - i - 1;
va_list arg_ptr;
int i, len, maxlen;
- i = sprintf(*pool_buf, "%s:%d ", file, line);
+ i = sprintf(*pool_buf, "%s:%d ", get_basename(file), line);
for (;;) {
maxlen = sizeof_pool_memory(*pool_buf) - i - 1;
va_list arg_ptr;
int i, len, maxlen;
- i = sprintf(pool_buf, "%s:%d ", file, line);
+ i = sprintf(pool_buf, "%s:%d ", get_basename(file), line);
for (;;) {
maxlen = sizeof_pool_memory(pool_buf) - i - 1;
P(msg_queue_mutex);
jcr->msg_queue->append(item);
V(msg_queue_mutex);
-// Dmsg1(000, "queue item=%lu\n", (long unsigned)item);
}
free_memory(pool_buf);
}
{
MQUEUE_ITEM *item;
P(msg_queue_mutex);
+ if (!jcr->msg_queue) {
+ goto bail_out;
+ }
jcr->dequeuing = true;
foreach_dlist(item, jcr->msg_queue) {
-// Dmsg1(000, "dequeue item=%lu\n", (long unsigned)item);
Jmsg(jcr, item->type, item->mtime, "%s", item->msg);
}
jcr->msg_queue->destroy();
jcr->dequeuing = false;
+
+bail_out:
V(msg_queue_mutex);
}
projects / bacula / bacula / blobdiff