*/
/*
- 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
int console_msg_pending = 0;
char con_fname[1000];
FILE *con_fd = NULL;
-pthread_mutex_t con_mutex = PTHREAD_MUTEX_INITIALIZER;
+brwlock_t con_lock;
+
+#ifdef TRACE_FILE
+FILE *trace_fd = NULL;
+#endif
/* Forward referenced functions */
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++) {
}
exename = (char *)malloc(len);
strcpy(exename, l);
+
if (exepath) {
free(exepath);
}
/*
* Initialize message handler for a daemon or a Job
+ * We make a copy of the MSGS resource passed, so it belows
+ * to the job or daemon and thus can be modified.
*
* NULL for jcr -> initialize global messages for daemon
* non-NULL -> initialize jcr using Message resource
/*
* Walk down the message resource chain duplicating it
- * for the current Job.
+ * for the current Job. ****FIXME***** segfault on memcpy
*/
for (d=msg->dest_chain; d; d=d->next) {
dnew = (DEST *)malloc(sizeof(DEST));
}
if (jcr) {
- jcr->msgs = (MSGS *)malloc(sizeof(MSGS));
- memset(jcr->msgs, 0, sizeof(MSGS));
- jcr->msgs->dest_chain = temp_chain;
- memcpy(jcr->msgs->send_msg, msg->send_msg, sizeof(msg->send_msg));
+ jcr->jcr_msgs = (MSGS *)malloc(sizeof(MSGS));
+ memset(jcr->jcr_msgs, 0, sizeof(MSGS));
+ jcr->jcr_msgs->dest_chain = temp_chain;
+ memcpy(jcr->jcr_msgs->send_msg, msg->send_msg, sizeof(msg->send_msg));
} else {
daemon_msgs = (MSGS *)malloc(sizeof(MSGS));
memset(daemon_msgs, 0, sizeof(MSGS));
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
sprintf(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",
+ Emsg2(M_ERROR_TERM, 0, _("Could not open console message file %s: ERR=%s\n"),
con_fname, strerror(errno));
}
if (lseek(fd, 0, SEEK_END) > 0) {
close(fd);
con_fd = fopen(con_fname, "a+");
if (!con_fd) {
- Emsg2(M_ERROR, 0, "Could not open console message file %s: ERR=%s\n",
+ Emsg2(M_ERROR, 0, _("Could not open console message file %s: ERR=%s\n"),
con_fname, strerror(errno));
}
+ if (rwl_init(&con_lock) != 0) {
+ Emsg1(M_ERROR_TERM, 0, _("Could not get con mutex: ERR=%s\n"),
+ strerror(errno));
+ }
}
/*
if (dest_code == d->dest_code && ((where == NULL && d->where == NULL) ||
(strcmp(where, d->where) == 0))) {
Dmsg4(200, "Add to existing d=%x msgtype=%d destcode=%d where=%s\n",
- d, msg_type, dest_code, where);
+ 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 */
return;
d->mail_cmd = bstrdup(mail_cmd);
}
Dmsg5(200, "add new d=%x msgtype=%d destcode=%d where=%s mailcmd=%s\n",
- d, msg_type, dest_code, where?where:"(null)",
- d->mail_cmd?d->mail_cmd:"(null)");
+ 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(200, "Remove_msg_dest d=%x where=%s\n", d, d->where);
+ Dmsg2(200, "Remove_msg_dest d=%x 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))) {
}
}
-/*
- * Concatenate a string (str) onto a message (msg)
- * return new message pointer
- */
-static void add_str(POOLMEM **base, char **msg, char *str)
-{
- int len = strlen(str) + 1;
- char *b, *m;
-
- b = *base;
- *base = check_pool_memory_size(*base, len);
- m = *base - b + *msg;
- while (*str) {
- *m++ = *str++;
- }
- *msg = m;
-}
-
-/*
- * Convert Job Termination Status into a string
- */
-static char *job_status_to_str(int stat)
-{
- char *str;
-
- switch (stat) {
- case JS_Terminated:
- str = "OK";
- break;
- case JS_ErrorTerminated:
- case JS_Error:
- str = "Error";
- break;
- case JS_FatalError:
- str = "Fatal Error";
- break;
- case JS_Cancelled:
- str = "Cancelled";
- break;
- case JS_Differences:
- str = "Differences";
- break;
- default:
- str = "Unknown term code";
- break;
- }
- return str;
-}
-/*
- * Convert Job Type into a string
- */
-static char *job_type_to_str(int type)
+static void make_unique_spool_filename(JCR *jcr, POOLMEM **name, int fd)
{
- char *str;
-
- switch (type) {
- case JT_BACKUP:
- str = "Backup";
- break;
- case JT_VERIFY:
- str = "Verify";
- break;
- case JT_RESTORE:
- str = "Restore";
- break;
- default:
- str = "Unknown Job Type";
- break;
- }
- return str;
+ Mmsg(name, "%s/%s.spool.%s.%d", working_directory, my_name,
+ jcr->Job, fd);
}
-/*
- * Convert Job Level into a string
- */
-static char *job_level_to_str(int level)
+int open_spool_file(void *vjcr, BSOCK *bs)
{
- char *str;
-
- switch (level) {
- case L_FULL:
- str = "full";
- break;
- case L_INCREMENTAL:
- str = "incremental";
- break;
- case L_DIFFERENTIAL:
- str = "differential";
- break;
- case L_LEVEL:
- str = "level";
- break;
- case L_SINCE:
- str = "since";
- break;
- case L_VERIFY_CATALOG:
- str = "verify catalog";
- break;
- case L_VERIFY_INIT:
- str = "verify init";
- break;
- case L_VERIFY_VOLUME:
- str = "verify volume";
- break;
- case L_VERIFY_DATA:
- str = "verify data";
- break;
- default:
- str = "Unknown Job level";
- break;
- }
- return str;
+ 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+");
+ 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 0;
+ }
+ free_pool_memory(name);
+ return 1;
}
-
-/*
- * Edit job codes into main command line
- * %% = %
- * %j = Job name
- * %t = Job type (Backup, ...)
- * %e = Job Exit code
- * %l = job level
- * %c = Client's name
- * %r = Recipients
- * %d = Director's name
- */
-static char *edit_job_codes(JCR *jcr, char *omsg, char *imsg, char *to)
+int close_spool_file(void *vjcr, BSOCK *bs)
{
- char *p, *o, *str;
- char add[3];
-
- Dmsg1(200, "edit_job_codes: %s\n", imsg);
- add[2] = 0;
- o = omsg;
- for (p=imsg; *p; p++) {
- if (*p == '%') {
- switch (*++p) {
- case '%':
- add[0] = '%';
- add[1] = 0;
- str = add;
- break;
- case 'j': /* Job name */
- str = jcr->Job;
- break;
- case 'e':
- str = job_status_to_str(jcr->JobStatus);
- break;
- case 't':
- str = job_type_to_str(jcr->JobType);
- break;
- case 'r':
- str = to;
- break;
- case 'l':
- str = job_level_to_str(jcr->JobLevel);
- break;
- case 'c':
- str = jcr->client_name;
- if (!str) {
- str = "";
- }
- break;
- case 'd':
- str = my_name; /* Director's name */
- break;
- default:
- add[0] = '%';
- add[1] = *p;
- str = add;
- break;
- }
- } else {
- add[0] = *p;
- add[1] = 0;
- str = add;
- }
- Dmsg1(200, "add_str %s\n", str);
- add_str(&omsg, &o, str);
- *o = 0;
- Dmsg1(200, "omsg=%s\n", omsg);
- }
- *o = 0;
- return omsg;
+ 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);
+ free_pool_memory(name);
+ bs->spool_fd = NULL;
+ bs->spool = 0;
+ return 1;
}
+
/*
* Create a unique filename for the mail command
*/
-static void make_unique_mail_filename(JCR *jcr, char **name, DEST *d)
+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,
/*
* Open a mail pipe
*/
-static FILE *open_mail_pipe(JCR *jcr, char **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;
}
/*
MSGS *msgs;
JCR *jcr = (JCR *)vjcr;
DEST *d;
- FILE *pfd;
+ BPIPE *bpipe;
POOLMEM *cmd, *line;
- int len;
+ int len, stat;
Dmsg1(050, "Close_msg jcr=0x%x\n", jcr);
msgs = daemon_msgs;
daemon_msgs = NULL;
} else {
- msgs = jcr->msgs;
- jcr->msgs = NULL;
+ msgs = jcr->jcr_msgs;
+ jcr->jcr_msgs = NULL;
}
if (msgs == NULL) {
return;
}
- Dmsg1(050, "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) {
break;
case MD_MAIL:
case MD_MAIL_ON_ERROR:
+ Dmsg0(150, "Got MD_MAIL or MD_MAIL_ON_ERROR\n");
if (!d->fd) {
break;
}
goto rem_temp_file;
}
- pfd = open_mail_pipe(jcr, &cmd, d);
- if (!pfd) {
+ if (!(bpipe=open_mail_pipe(jcr, &cmd, d))) {
+ Dmsg0(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);
+ fputs(line, bpipe->wfd);
+ }
+ if (!close_wpipe(bpipe)) { /* close write pipe sending mail */
+ Dmsg1(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 (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);
+ }
+ }
+
+ 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);
}
- pclose(pfd); /* close pipe, sending mail */
free_memory(line);
rem_temp_file:
/* Remove temp file */
unlink(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;
d = d->next; /* point to next buffer */
}
free_pool_memory(cmd);
-
+ Dmsg0(150, "Done walking message chain.\n");
free_msgs_res(msgs);
msgs = NULL;
+ Dmsg0(150, "===End close msg resource\n");
}
/*
free(exename);
exename = NULL;
}
+ if (trace_fd) {
+ fclose(trace_fd);
+ trace_fd = NULL;
+ }
}
void dispatch_message(void *vjcr, 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);
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 */
msgs = NULL;
if (jcr) {
- msgs = jcr->msgs;
+ msgs = jcr->jcr_msgs;
}
if (msgs == NULL) {
msgs = daemon_msgs;
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(400, "CONSOLE for following msg: %s", msg);
if (!con_fd) {
con_fd = fopen(con_fname, "a+");
Dmsg0(200, "Console file not open.\n");
}
if (con_fd) {
- P(con_mutex);
+ 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;
- V(con_mutex);
+ Vw(con_lock);
}
break;
case MD_SYSLOG:
- Dmsg1(200, "SYSLOG for following err: %s\n", msg);
+ Dmsg1(400, "SYSLOG for collowing msg: %s\n", msg);
/* We really should do an openlog() here */
syslog(LOG_DAEMON|LOG_ERR, msg);
break;
case MD_OPERATOR:
- Dmsg1(200, "OPERATOR for following err: %s\n", msg);
+ Dmsg1(400, "OPERATOR for collowing msg: %s\n", msg);
mcmd = get_pool_memory(PM_MESSAGE);
- d->fd = open_mail_pipe(jcr, &mcmd, d);
- free_pool_memory(mcmd);
- if (d->fd) {
- fputs(msg, d->fd);
+ if ((bpipe=open_mail_pipe(jcr, &mcmd, d))) {
+ int stat;
+ fputs(msg, bpipe->wfd);
/* Messages to the operator go one at a time */
- pclose(d->fd);
- d->fd = NULL;
+ stat = close_bpipe(bpipe);
+ if (stat != 0) {
+ Emsg1(M_ERROR, 0, _("Operator mail program terminated in error.\nCMD=%s\n"),
+ mcmd);
+ }
}
+ free_pool_memory(mcmd);
break;
case MD_MAIL:
case MD_MAIL_ON_ERROR:
- Dmsg1(200, "MAIL for following err: %s\n", msg);
+ Dmsg1(400, "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+");
if (!d->fd) {
+ d->fd = stdout;
Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", name, strerror(errno));
+ d->fd = NULL;
free_pool_memory(name);
break;
}
fputs(msg, d->fd);
break;
case MD_FILE:
- Dmsg1(200, "FILE for following err: %s\n", msg);
+ Dmsg1(400, "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));
+ d->fd = NULL;
break;
}
}
fputs(msg, d->fd);
break;
case MD_APPEND:
- Dmsg1(200, "APPEND for following err: %s\n", msg);
+ Dmsg1(400, "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));
+ d->fd = NULL;
break;
}
}
fputs(msg, d->fd);
break;
case MD_DIRECTOR:
- Dmsg1(200, "DIRECTOR for following err: %s\n", msg);
+ Dmsg1(400, "DIRECTOR for following msg: %s", msg);
if (jcr && jcr->dir_bsock && !jcr->dir_bsock->errors) {
jcr->dir_bsock->msglen = Mmsg(&(jcr->dir_bsock->msg),
}
break;
case MD_STDOUT:
- Dmsg1(200, "STDOUT for following err: %s\n", msg);
+ Dmsg1(400, "STDOUT for following msg: %s", msg);
if (type != M_ABORT && type != M_ERROR_TERM) /* already printed */
- fprintf(stdout, msg);
+ fputs(msg, stdout);
break;
case MD_STDERR:
- Dmsg1(200, "STDERR for following err: %s\n", msg);
- fprintf(stderr, msg);
+ Dmsg1(400, "STDERR for following msg: %s", msg);
+ fputs(msg, stderr);
break;
default:
break;
void
d_msg(char *file, int line, int level, char *fmt,...)
{
- char buf[MAXSTRING];
- int i;
+ char buf[5000];
+ int len;
va_list arg_ptr;
int details = TRUE;
level = -level;
}
-/* printf("level=%d debug=%d fmt=%s\n", level, debug_level, fmt); */
+ if (level <= debug_level) {
+#ifdef FULL_LOCATION
+ if (details) {
+ len= sprintf(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(char *file, int line, int level, char *fmt,...)
+{
+ char buf[5000];
+ int len;
+ va_list arg_ptr;
+ int details = TRUE;
+
+ return;
+
+ if (level < 0) {
+ details = FALSE;
+ level = -level;
+ }
if (level <= debug_level) {
+ if (!trace_fd) {
+ trace_fd = fopen("bacula.trace", "a+");
+ if (!trace_fd) {
+ Emsg1(M_ABORT, 0, _("Cannot open bacula.trace: ERR=%s\n"),
+ strerror(errno));
+ }
+ }
+
#ifdef FULL_LOCATION
if (details) {
- sprintf(buf, "%s: %s:%d ", my_name, file, line);
- i = strlen(buf);
+ len = sprintf(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);
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
}
}
+
/* *********************************************************
*
* print an error message
void
e_msg(char *file, int line, int type, int level, 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",
+ len = sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n",
my_name, file, line);
break;
case M_ERROR_TERM:
- sprintf(buf, "%s ERROR TERMINATING at %s:%d\n",
+ len = 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);
+ len = sprintf(buf, "%s: Fatal Error because: ", my_name);
else
- sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
+ len = 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);
+ len = sprintf(buf, "%s: Error: ", my_name);
else
- sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
+ len = sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
break;
case M_WARNING:
- sprintf(buf, "%s: Warning: ", my_name);
+ len = sprintf(buf, "%s: Warning: ", my_name);
break;
default:
- sprintf(buf, "%s: ", my_name);
+ len = sprintf(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);
void
Jmsg(void *vjcr, int type, int level, char *fmt,...)
{
- char rbuf[2000];
- char *buf;
+ char rbuf[5000];
va_list arg_ptr;
- int i, len;
- JCR *jcr = (JCR *) vjcr;
- int typesave = type;
+ int len;
+ JCR *jcr = (JCR *)vjcr;
MSGS *msgs;
char *job;
msgs = NULL;
job = NULL;
if (jcr) {
- msgs = jcr->msgs;
+ msgs = jcr->jcr_msgs;
job = jcr->Job;
}
if (!msgs) {
- msgs = daemon_msgs;
+ msgs = daemon_msgs; /* if no jcr, we use daemon handler */
}
if (!job) {
- job = "*None*";
+ 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);
+
+ /* There is an apparent compiler bug with the following if
+ * statement, so the set_jcr... is simply a noop to reload
+ * registers.
+ */
+ set_jcr_job_status(jcr, jcr->JobStatus);
+ 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);
+ len = sprintf(rbuf, "%s ABORTING due to ERROR\n", my_name);
break;
case M_ERROR_TERM:
- sprintf(buf, "%s ERROR TERMINATING\n", my_name);
+ len = sprintf(rbuf, "%s ERROR TERMINATION\n", my_name);
break;
case M_FATAL:
- sprintf(buf, "%s: Job %s Fatal error: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Fatal error: ", my_name, job);
if (jcr) {
- jcr->JobStatus = JS_FatalError;
+ set_jcr_job_status(jcr, JS_FatalError);
}
break;
case M_ERROR:
- sprintf(buf, "%s: Job %s Error: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Error: ", my_name, job);
if (jcr) {
jcr->Errors++;
}
break;
case M_WARNING:
- sprintf(buf, "%s: Job %s Warning: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Warning: ", my_name, job);
break;
default:
- sprintf(buf, "%s: ", my_name);
+ len = sprintf(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);
- ASSERT(typesave==type); /* type trashed, compiler bug???? */
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 */
va_list arg_ptr;
int i, len, maxlen;
- sprintf(*pool_buf, "%s:%d ", file, line);
- i = strlen(*pool_buf);
+ i = sprintf(*pool_buf, "%s:%d ", file, line);
again:
maxlen = sizeof_pool_memory(*pool_buf) - i - 1;
POOLMEM *pool_buf;
pool_buf = get_pool_memory(PM_EMSG);
- sprintf(pool_buf, "%s:%d ", file, line);
- i = strlen(pool_buf);
+ i = sprintf(pool_buf, "%s:%d ", file, line);
again:
maxlen = sizeof_pool_memory(pool_buf) - i - 1;
goto again;
}
- Jmsg(jcr, type, level, pool_buf);
+ Jmsg(jcr, type, level, "%s", pool_buf);
free_memory(pool_buf);
}
projects / bacula / bacula / blobdiff