*/
/*
- 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
FILE *con_fd = NULL;
brwlock_t con_lock;
+#ifdef TRACE_FILE
+FILE *trace_fd = NULL;
+#endif
+
/* Forward referenced functions */
/* Imported functions */
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
if (msgs != daemon_msgs) {
/* read what mail prog returned -- should be nothing */
while (fgets(line, len, bpipe->rfd)) {
-// Dmsg1(000, "Mail prog got: %s", line);
Jmsg1(jcr, M_INFO, 0, _("Mail prog: %s"), line);
}
}
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;
Dmsg2(200, "Enter dispatch_msg type=%d msg=%s\n", type, msg);
if (type == M_ABORT || type == M_ERROR_TERM) {
- fprintf(stdout, "%s", 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 */
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);
case MD_STDOUT:
Dmsg1(400, "STDOUT for following msg: %s", msg);
if (type != M_ABORT && type != M_ERROR_TERM) /* already printed */
- fprintf(stdout, "%s", msg);
+ fputs(msg, stdout);
break;
case MD_STDERR:
Dmsg1(400, "STDERR for following msg: %s", msg);
- fprintf(stderr, "%s", msg);
+ fputs(msg, stderr);
break;
default:
break;
void
d_msg(char *file, int line, int level, char *fmt,...)
{
- char buf[2000];
- int i;
+ char buf[5000];
+ int len;
va_list arg_ptr;
int details = TRUE;
if (level <= debug_level) {
#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, "%s", buf);
+ 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) {
+ 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, 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 TERMINATION 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;
+ int len;
JCR *jcr = (JCR *)vjcr;
MSGS *msgs;
char *job;
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);
+
+ /* 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 TERMINATION\n", my_name);
+ len = sprintf(rbuf, "%s ERROR TERMINATION\n", my_name);
break;
case M_FATAL:
- sprintf(buf, "%s: %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: %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: %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);
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;
goto again;
}
- Jmsg(jcr, type, level, pool_buf);
+ Jmsg(jcr, type, level, "%s", pool_buf);
free_memory(pool_buf);
}
projects / bacula / bacula / blobdiff