X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2Fmessage.c;h=03aab84941932d760f53197a8f39df546aedec2a;hb=cde886ebdbbac52b02b2ce6815ff6889a77f57da;hp=911a7a2e472859dac363554f9d62819cb27c5058;hpb=1f36d027a33ea721b51cd4afa1492661cb1f14d5;p=bacula%2Fbacula diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index 911a7a2e47..03aab84941 100755 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -8,7 +8,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2003 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -33,17 +33,41 @@ #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 debug_level = 5; /* debug level */ +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 */ +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; -char con_fname[1000]; -FILE *con_fd = NULL; -brwlock_t con_lock; +char con_fname[500]; /* Console filename */ +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; /* Forward referenced functions */ @@ -65,14 +89,13 @@ static MSGS *daemon_msgs; /* global messages */ * 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]; int len; - strncpy(my_name, name, sizeof(my_name)); - my_name[sizeof(my_name)-1] = 0; + bstrncpy(my_name, name, sizeof(my_name)); if (argc>0 && argv && argv[0]) { /* strip trailing filename and save exepath */ for (l=p=argv[0]; *p; p++) { @@ -84,7 +107,7 @@ void my_name_is(int argc, char *argv[], char *name) 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; @@ -136,16 +159,38 @@ void my_name_is(int argc, char *argv[], char *name) * 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++) { @@ -158,7 +203,7 @@ init_msg(void *vjcr, MSGS *msg) /* * Walk down the message resource chain duplicating it - * for the current Job. ****FIXME***** segfault on memcpy + * for the current Job. */ for (d=msg->dest_chain; d; d=d->next) { dnew = (DEST *)malloc(sizeof(DEST)); @@ -181,12 +226,17 @@ init_msg(void *vjcr, MSGS *msg) jcr->jcr_msgs->dest_chain = temp_chain; memcpy(jcr->jcr_msgs->send_msg, msg->send_msg, sizeof(msg->send_msg)); } else { + /* If we have default values, release them now */ + if (daemon_msgs) { + free_msgs_res(daemon_msgs); + } daemon_msgs = (MSGS *)malloc(sizeof(MSGS)); memset(daemon_msgs, 0, sizeof(MSGS)); daemon_msgs->dest_chain = temp_chain; memcpy(daemon_msgs->send_msg, msg->send_msg, sizeof(msg->send_msg)); } Dmsg2(050, "Copy message resource 0x%x to 0x%x\n", msg, temp_chain); + } /* Initialize so that the console (User Agent) can @@ -196,7 +246,7 @@ void init_console_msg(char *wd) { int fd; - sprintf(con_fname, "%s/%s.conmsg", wd, my_name); + bsnprintf(con_fname, sizeof(con_fname), "%s/%s.conmsg", wd, my_name); fd = open(con_fname, O_CREAT|O_RDWR|O_BINARY, 0600); if (fd == -1) { Emsg2(M_ERROR_TERM, 0, _("Could not open console message file %s: ERR=%s\n"), @@ -284,99 +334,18 @@ void rem_msg_dest(MSGS *msg, int dest_code, int msg_type, char *where) } } - - - -/* - * Edit job codes into main command line - * %% = % - * %j = Job name - * %t = Job type (Backup, ...) - * %e = Job Exit code - * %i = JobId - * %l = job level - * %c = Client's name - * %r = Recipients - * %d = Director's name - * - * omsg = edited output message - * imsg = input string containing edit codes (%x) - * to = recepients list - * - */ -static char *edit_job_codes(JCR *jcr, char *omsg, char *imsg, char *to) -{ - char *p, *str; - char add[20]; - - *omsg = 0; - Dmsg1(200, "edit_job_codes: %s\n", imsg); - for (p=imsg; *p; p++) { - if (*p == '%') { - switch (*++p) { - case '%': - str = "%"; - break; - case 'c': - str = jcr->client_name; - if (!str) { - str = ""; - } - break; - case 'd': - str = my_name; /* Director's name */ - break; - case 'e': - str = job_status_to_str(jcr->JobStatus); - break; - case 'i': - sprintf(add, "%d", jcr->JobId); - str = add; - break; - case 'j': /* Job name */ - str = jcr->Job; - break; - case 'l': - str = job_level_to_str(jcr->JobLevel); - break; - case 'r': - str = to; - break; - case 't': - str = job_type_to_str(jcr->JobType); - break; - default: - add[0] = '%'; - add[1] = *p; - add[2] = 0; - str = add; - break; - } - } else { - add[0] = *p; - add[1] = 0; - str = add; - } - Dmsg1(200, "add_str %s\n", str); - pm_strcat(&omsg, str); - Dmsg1(200, "omsg=%s\n", omsg); - } - return omsg; -} - static void make_unique_spool_filename(JCR *jcr, POOLMEM **name, int fd) { Mmsg(name, "%s/%s.spool.%s.%d", working_directory, my_name, 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); @@ -386,21 +355,19 @@ int open_spool_file(void *vjcr, BSOCK *bs) 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; return 1; } - /* * Create a unique filename for the mail command */ @@ -419,33 +386,33 @@ static void make_unique_mail_filename(JCR *jcr, POOLMEM **name, DEST *d) /* * Open a mail pipe */ -static FILE *open_mail_pipe(JCR *jcr, POOLMEM **cmd, DEST *d) +static BPIPE *open_mail_pipe(JCR *jcr, POOLMEM **cmd, DEST *d) { - FILE *pfd; + BPIPE *bpipe; if (d->mail_cmd && jcr) { *cmd = edit_job_codes(jcr, *cmd, d->mail_cmd, d->where); } else { Mmsg(cmd, "mail -s \"Bacula Message\" %s", d->where); } - Dmsg1(200, "mailcmd=%s\n", cmd); - pfd = popen(*cmd, "w"); - if (!pfd) { - Jmsg(jcr, M_ERROR, 0, "mail popen %s failed: ERR=%s\n", cmd, strerror(errno)); + 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)); } - return pfd; + 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; - FILE *pfd; + BPIPE *bpipe; POOLMEM *cmd, *line; int len, stat; @@ -453,7 +420,6 @@ void close_msg(void *vjcr) if (jcr == NULL) { /* NULL -> global chain */ msgs = daemon_msgs; - daemon_msgs = NULL; } else { msgs = jcr->jcr_msgs; jcr->jcr_msgs = NULL; @@ -461,7 +427,7 @@ void close_msg(void *vjcr) if (msgs == NULL) { return; } - Dmsg1(150, "begin close msg resource at 0x%x\n", msgs); + Dmsg1(150, "===Begin close msg resource at 0x%x\n", msgs); cmd = get_pool_memory(PM_MESSAGE); for (d=msgs->dest_chain; d; ) { if (d->fd) { @@ -474,6 +440,7 @@ void close_msg(void *vjcr) break; case MD_MAIL: case MD_MAIL_ON_ERROR: + Dmsg0(150, "Got MD_MAIL or MD_MAIL_ON_ERROR\n"); if (!d->fd) { break; } @@ -482,33 +449,48 @@ void close_msg(void *vjcr) goto rem_temp_file; } - pfd = open_mail_pipe(jcr, &cmd, d); - if (!pfd) { + if (!(bpipe=open_mail_pipe(jcr, &cmd, d))) { + 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)) { - fputs(line, pfd); + while (fgets(mp_chr(line), len, d->fd)) { + fputs(line, bpipe->wfd); } - stat = pclose(pfd); /* close pipe, sending mail */ + if (!close_wpipe(bpipe)) { /* close write pipe sending mail */ + Pmsg1(000, "close error: ERR=%s\n", strerror(errno)); + } + /* * Since we are closing all messages, before "recursing" * make sure we are not closing the daemon messages, otherwise * kaboom. */ - if (stat < 0 && msgs != daemon_msgs && errno != ECHILD) { - Emsg1(M_ERROR, 0, _("Mail program terminated in error.\nCMD=%s\n"), - cmd); + if (msgs != daemon_msgs) { + /* read what mail prog returned -- should be nothing */ + 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); + 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"); break; default: break; @@ -518,10 +500,12 @@ rem_temp_file: d = d->next; /* point to next buffer */ } free_pool_memory(cmd); - - free_msgs_res(msgs); - msgs = NULL; - Dmsg0(150, "end close msg resource\n"); + Dmsg0(150, "Done walking message chain.\n"); + if (jcr) { + free_msgs_res(msgs); + msgs = NULL; + } + Dmsg0(150, "===End close msg resource\n"); } /* @@ -531,6 +515,7 @@ void free_msgs_res(MSGS *msgs) { DEST *d, *old; + /* Walk down the message chain releasing allocated buffers */ for (d=msgs->dest_chain; d; ) { if (d->where) { free(d->where); @@ -543,7 +528,7 @@ void free_msgs_res(MSGS *msgs) free(old); /* free the destination item */ } msgs->dest_chain = NULL; - free(msgs); + free(msgs); /* free the head */ } @@ -558,6 +543,7 @@ void term_msg() { Dmsg0(100, "Enter term_msg\n"); close_msg(NULL); /* close global chain */ + free_msgs_res(daemon_msgs); /* free the resources */ daemon_msgs = NULL; if (con_fd) { fflush(con_fd); @@ -572,6 +558,11 @@ void term_msg() free(exename); exename = NULL; } + if (trace_fd) { + fclose(trace_fd); + trace_fd = NULL; + } + term_last_jobs_list(); } @@ -579,19 +570,19 @@ void term_msg() /* * 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 cmd[MAXSTRING]; + char dt[MAX_TIME_LENGTH]; POOLMEM *mcmd; - JCR *jcr = (JCR *) vjcr; int len; MSGS *msgs; + BPIPE *bpipe; - Dmsg2(200, "Enter dispatch_msg type=%d msg=%s\n", type, msg); + Dmsg2(800, "Enter dispatch_msg type=%d msg=%s\n", type, msg); if (type == M_ABORT || type == M_ERROR_TERM) { - fprintf(stdout, msg); /* print this here to INSURE that it is printed */ + fputs(msg, stdout); /* print this here to INSURE that it is printed */ } /* Now figure out where to send the message */ @@ -606,61 +597,65 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) if (bit_is_set(type, d->msg_types)) { switch (d->dest_code) { case MD_CONSOLE: - Dmsg1(200, "CONSOLE for following err: %s\n", msg); + Dmsg1(800, "CONSOLE for following msg: %s", msg); if (!con_fd) { con_fd = fopen(con_fname, "a+"); - Dmsg0(200, "Console file not open.\n"); + Dmsg0(800, "Console file not open.\n"); } if (con_fd) { Pw(con_lock); /* get write lock on console message file */ errno = 0; - bstrftime(cmd, sizeof(cmd), time(NULL)); - len = strlen(cmd); - cmd[len++] = ' '; - fwrite(cmd, len, 1, con_fd); + bstrftime(dt, sizeof(dt), time(NULL)); + len = strlen(dt); + dt[len++] = ' '; + fwrite(dt, len, 1, con_fd); len = strlen(msg); - if (len > 0 && msg[len-1] != '\n') { - msg[len++] = '\n'; - msg[len] = 0; + if (len > 0) { + fwrite(msg, len, 1, con_fd); + if (msg[len-1] != '\n') { + fwrite("\n", 2, 1, con_fd); + } + } else { + fwrite("\n", 2, 1, con_fd); } - fwrite(msg, len, 1, con_fd); fflush(con_fd); console_msg_pending = TRUE; Vw(con_lock); } break; case MD_SYSLOG: - Dmsg1(200, "SYSLOG for following err: %s\n", msg); - /* We really should do an openlog() here */ - syslog(LOG_DAEMON|LOG_ERR, msg); + Dmsg1(800, "SYSLOG for collowing msg: %s\n", msg); + /* + * We really should do an openlog() here. + */ + syslog(LOG_DAEMON|LOG_ERR, "%s", msg); break; case MD_OPERATOR: - Dmsg1(200, "OPERATOR for following err: %s\n", msg); + Dmsg1(800, "OPERATOR for collowing msg: %s\n", msg); mcmd = get_pool_memory(PM_MESSAGE); - d->fd = open_mail_pipe(jcr, &mcmd, d); - if (d->fd) { + if ((bpipe=open_mail_pipe(jcr, &mcmd, d))) { int stat; - fputs(msg, d->fd); + fputs(msg, bpipe->wfd); /* Messages to the operator go one at a time */ - stat = pclose(d->fd); - d->fd = NULL; - if (stat < 0 && errno != ECHILD) { - Emsg1(M_ERROR, 0, _("Operator mail program terminated in error.\nCMD=%s\n"), - mcmd); + stat = close_bpipe(bpipe); + if (stat != 0) { + 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); break; case MD_MAIL: case MD_MAIL_ON_ERROR: - Dmsg1(200, "MAIL for following err: %s\n", msg); + 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; @@ -674,12 +669,12 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) fputs(msg, d->fd); break; case MD_FILE: - Dmsg1(200, "FILE for following err: %s\n", msg); + Dmsg1(800, "FILE for following msg: %s", msg); if (!d->fd) { 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; } @@ -687,12 +682,12 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) fputs(msg, d->fd); break; case MD_APPEND: - Dmsg1(200, "APPEND for following err: %s\n", msg); + Dmsg1(800, "APPEND for following msg: %s", msg); if (!d->fd) { 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; } @@ -700,23 +695,21 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) fputs(msg, d->fd); break; case MD_DIRECTOR: - Dmsg1(200, "DIRECTOR for following err: %s\n", msg); + 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: - Dmsg1(200, "STDOUT for following err: %s\n", msg); - if (type != M_ABORT && type != M_ERROR_TERM) /* already printed */ - fprintf(stdout, msg); + Dmsg1(800, "STDOUT for following msg: %s", msg); + if (type != M_ABORT && type != M_ERROR_TERM) { /* already printed */ + fputs(msg, stdout); + } break; case MD_STDERR: - Dmsg1(200, "STDERR for following err: %s\n", msg); - fprintf(stderr, msg); + Dmsg1(800, "STDERR for following msg: %s", msg); + fputs(msg, stderr); break; default: break; @@ -728,7 +721,7 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) /********************************************************************* * - * 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. @@ -737,10 +730,10 @@ void dispatch_message(void *vjcr, int type, int level, char *msg) * 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[MAXSTRING]; - int i; + char buf[5000]; + int len; va_list arg_ptr; int details = TRUE; @@ -750,76 +743,179 @@ d_msg(char *file, int line, int level, char *fmt,...) } if (level <= debug_level) { +#ifdef HAVE_WIN32 +#define SEND_DMSG_TO_FILE +#endif +#ifdef SEND_DMSG_TO_FILE + if (!trace_fd) { + bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory ? working_directory : "."); + trace_fd = fopen(buf, "a+"); + } +#endif #ifdef FULL_LOCATION if (details) { - sprintf(buf, "%s: %s:%d ", my_name, file, line); - i = strlen(buf); + /* 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 { - i = 0; + len = 0; } #else - i = 0; + len = 0; #endif va_start(arg_ptr, fmt); - bvsnprintf(buf+i, sizeof(buf)-i, (char *)fmt, arg_ptr); + bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr); va_end(arg_ptr); - fprintf(stdout, buf); +#ifdef SEND_DMSG_TO_FILE + if (trace_fd) { + fputs(buf, trace_fd); + fflush(trace_fd); + } +#else + fputs(buf, stdout); +#endif + } +} + + +/********************************************************************* + * + * 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 + 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); +} + + +/********************************************************************* + * + * subroutine writes a debug message to the trace file 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. + * + * If the level is negative, the details of file and line number + * are not printed. + */ +void +t_msg(const char *file, int line, int level, const char *fmt,...) +{ + char buf[5000]; + int len; + va_list arg_ptr; + int details = TRUE; + + if (level < 0) { + details = FALSE; + level = -level; } + + if (level <= debug_level) { + if (!trace_fd) { + bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory); + trace_fd = fopen(buf, "a+"); + } + +#ifdef FULL_LOCATION + if (details) { + len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line); + } else { + len = 0; + } +#else + len = 0; +#endif + va_start(arg_ptr, fmt); + bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr); + va_end(arg_ptr); + if (trace_fd != NULL) { + fputs(buf, trace_fd); + fflush(trace_fd); + } + } } + /* ********************************************************* * * print an error message * */ 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[2000]; + char buf[5000]; va_list arg_ptr; - int i; + int len; /* * Check if we have a message destination defined. * We always report M_ABORT and M_ERROR_TERM */ if (!daemon_msgs || ((type != M_ABORT && type != M_ERROR_TERM) && - !bit_is_set(type, daemon_msgs->send_msg))) + !bit_is_set(type, daemon_msgs->send_msg))) { return; /* no destination */ + } switch (type) { - case M_ABORT: - sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n", - my_name, file, line); - break; - case M_ERROR_TERM: - sprintf(buf, "%s: ERROR TERMINATION at %s:%d\n", - my_name, file, line); - break; - case M_FATAL: - if (level == -1) /* skip details */ - sprintf(buf, "%s: Fatal Error because: ", my_name); - else - sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line); - break; - case M_ERROR: - if (level == -1) /* skip details */ - sprintf(buf, "%s: Error: ", my_name); - else - sprintf(buf, "%s: Error in %s:%d ", my_name, file, line); - break; - case M_WARNING: - sprintf(buf, "%s: Warning: ", my_name); - break; - default: - 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; } - i = strlen(buf); va_start(arg_ptr, fmt); - bvsnprintf(buf+i, sizeof(buf)-i, (char *)fmt, arg_ptr); + bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr); va_end(arg_ptr); dispatch_message(NULL, type, level, buf); @@ -829,7 +925,7 @@ e_msg(char *file, int line, int type, int level, char *fmt,...) p[0] = 0; /* generate segmentation violation */ } if (type == M_ERROR_TERM) { - _exit(1); + exit(1); } } @@ -839,18 +935,30 @@ e_msg(char *file, int line, int type, int level, char *fmt,...) * */ void -Jmsg(void *vjcr, int type, int level, char *fmt,...) +Jmsg(JCR *jcr, int type, int level, const char *fmt,...) { - char rbuf[2000]; - char *buf; + char rbuf[5000]; va_list arg_ptr; - int i, len; - JCR *jcr = (JCR *)vjcr; + int len; MSGS *msgs; char *job; - Dmsg1(200, "Enter Jmsg type=%d\n", type); + 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; @@ -859,76 +967,102 @@ Jmsg(void *vjcr, int type, int level, char *fmt,...) job = jcr->Job; } if (!msgs) { - msgs = daemon_msgs; + msgs = daemon_msgs; /* if no jcr, we use daemon handler */ } if (!job) { - job = ""; + job = ""; /* Set null job name if none */ } - buf = rbuf; /* we are the Director */ /* * Check if we have a message destination defined. * We always report M_ABORT and M_ERROR_TERM */ - if ((type != M_ABORT && type != M_ERROR_TERM) && msgs && !bit_is_set(type, msgs->send_msg)) { - Dmsg1(200, "No bit set for type %d\n", type); + if (msgs && (type != M_ABORT && type != M_ERROR_TERM) && + !bit_is_set(type, msgs->send_msg)) { return; /* no destination */ } switch (type) { - case M_ABORT: - sprintf(buf, "%s ABORTING due to ERROR\n", my_name); - break; - case M_ERROR_TERM: - sprintf(buf, "%s ERROR TERMINATION\n", my_name); - break; - case M_FATAL: - sprintf(buf, "%s: %s Fatal error: ", my_name, job); - if (jcr) { - jcr->JobStatus = JS_FatalError; - } - break; - case M_ERROR: - sprintf(buf, "%s: %s Error: ", my_name, job); - if (jcr) { - jcr->Errors++; - } - break; - case M_WARNING: - sprintf(buf, "%s: %s Warning: ", my_name, job); - break; - default: - sprintf(buf, "%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; } - i = strlen(buf); va_start(arg_ptr, fmt); - len = bvsnprintf(buf+i, sizeof(rbuf)-i, fmt, arg_ptr); + bvsnprintf(rbuf+len, sizeof(rbuf)-len, fmt, arg_ptr); va_end(arg_ptr); dispatch_message(jcr, type, level, rbuf); - Dmsg3(500, "i=%d sizeof(rbuf)-i=%d len=%d\n", i, sizeof(rbuf)-i, len); - if (type == M_ABORT){ char *p = 0; 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; - sprintf(*pool_buf, "%s:%d ", file, line); - i = strlen(*pool_buf); + i = sprintf(mp_chr(*pool_buf), "%s:%d ", file, line); again: maxlen = sizeof_pool_memory(*pool_buf) - i - 1; @@ -936,7 +1070,7 @@ again: 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; @@ -946,7 +1080,7 @@ again: * 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; @@ -957,26 +1091,79 @@ again: 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); - sprintf(pool_buf, "%s:%d ", file, line); - i = strlen(pool_buf); + i = Mmsg(&pool_buf, "%s:%d ", file, line); again: maxlen = sizeof_pool_memory(pool_buf) - i - 1; @@ -984,10 +1171,10 @@ again: 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, pool_buf); + Qmsg(jcr, type, level, "%s", pool_buf); free_memory(pool_buf); }