* University of Maryland at College Park
*/
/*
- * $Id: logfile.c,v 1.17.4.1.4.2.2.3 2003/01/01 23:28:56 martinea Exp $
+ * $Id: logfile.c,v 1.31 2006/06/01 14:54:39 martinea Exp $
*
* common log file writing routine
*/
#include "amanda.h"
#include "arglist.h"
+#include "util.h"
#include "conffile.h"
#include "logfile.h"
"ERROR", "WARNING", "INFO", "SUMMARY", /* information messages */
"START", "FINISH", /* start/end of a run */
"DISK", /* disk */
- "SUCCESS", "FAIL", "STRANGE", /* the end of a dump */
+ /* the end of a dump */
+ "DONE", "PART", "PARTPARTIAL", "SUCCESS", "PARTIAL", "FAIL", "STRANGE",
+ "CHUNK", "CHUNKSUCCESS", /* ... continued */
"STATS", /* statistics */
"MARKER", /* marker for reporter */
"CONT" /* continuation line; special */
};
char *program_str[] = {
- "UNKNOWN", "planner", "driver", "amreport", "dumper", "taper", "amflush"
+ "UNKNOWN", "planner", "driver", "amreport", "dumper", "chunker",
+ "taper", "amflush", "amdump", "amidxtaped", "amfetchdump", "amcheckdump"
};
int curlinenum;
*/
/* local functions */
-static void open_log P((void));
-static void close_log P((void));
+static void open_log(void);
+static void close_log(void);
-void logerror(msg)
-char *msg;
+void
+logerror(
+ char * msg)
{
log_add(L_FATAL, "%s", msg);
}
+
+printf_arglist_function2(char *log_genstring, logtype_t, typ, char *, pname, char *, format)
+{
+ va_list argp;
+ char *leader = NULL;
+ char linebuf[STR_SIZE];
+ char *xlated_fmt = dgettext("C", format);
+
+ /* format error message */
+
+ if((int)typ <= (int)L_BOGUS || (int)typ > (int)L_MARKER) typ = L_BOGUS;
+
+ if(multiline > 0) {
+ leader = stralloc(" "); /* continuation line */
+ } else {
+ leader = vstralloc(logtype_str[(int)typ], " ", pname, " ", NULL);
+ }
+
+ arglist_start(argp, format);
+ g_vsnprintf(linebuf, SIZEOF(linebuf)-1, xlated_fmt, argp);
+ /* -1 to allow for '\n' */
+ arglist_end(argp);
+ return(vstralloc(leader, linebuf, "\n", NULL));
+}
+
printf_arglist_function1(void log_add, logtype_t, typ, char *, format)
{
va_list argp;
int saved_errout;
char *leader = NULL;
+ char *xlated_fmt = gettext(format);
char linebuf[STR_SIZE];
- int l, n, s;
-
+ size_t n;
/* format error message */
}
arglist_start(argp, format);
- ap_vsnprintf(linebuf, sizeof(linebuf)-1, format, argp);
+ /* use sizeof(linebuf)-2 to save space for a trailing newline */
+ g_vsnprintf(linebuf, SIZEOF(linebuf)-2, xlated_fmt, argp);
/* -1 to allow for '\n' */
arglist_end(argp);
if(multiline == -1) open_log();
- for(l = 0, n = strlen(leader); l < n; l += s) {
- if((s = write(logfd, leader + l, n - l)) < 0) {
- error("log file write error: %s", strerror(errno));
- }
+ if (full_write(logfd, leader, strlen(leader)) < strlen(leader)) {
+ error(_("log file write error: %s"), strerror(errno));
+ /*NOTREACHED*/
}
amfree(leader);
+ /* add a newline if necessary */
n = strlen(linebuf);
if(n == 0 || linebuf[n-1] != '\n') linebuf[n++] = '\n';
linebuf[n] = '\0';
- for(l = 0; l < n; l += s) {
- if((s = write(logfd, linebuf + l, n - l)) < 0) {
- error("log file write error: %s", strerror(errno));
- }
+ if (full_write(logfd, linebuf, n) < n) {
+ error(_("log file write error: %s"), strerror(errno));
+ /*NOTREACHED*/
}
if(multiline != -1) multiline++;
erroutput_type = saved_errout;
}
-void log_start_multiline()
+void
+log_start_multiline(void)
{
assert(multiline == -1);
}
-void log_end_multiline()
+void
+log_end_multiline(void)
{
assert(multiline != -1);
multiline = -1;
}
-void log_rename(datestamp)
-char *datestamp;
+void
+log_rename(
+ char * datestamp)
{
char *conf_logdir;
char *logfile;
if(datestamp == NULL) datestamp = "error";
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
for(seq = 0; 1; seq++) { /* if you've got MAXINT files in your dir... */
- ap_snprintf(seq_str, sizeof(seq_str), "%d", seq);
+ g_snprintf(seq_str, SIZEOF(seq_str), "%u", seq);
fname = newvstralloc(fname,
logfile,
".", datestamp,
if(stat(fname, &statbuf) == -1 && errno == ENOENT) break;
}
- if(rename(logfile, fname) != 0) {
- error("could not rename \"%s\" to \"%s\": %s",
+ if(rename(logfile, fname) == -1) {
+ error(_("could not rename \"%s\" to \"%s\": %s"),
logfile, fname, strerror(errno));
+ /*NOTREACHED*/
}
amfree(fname);
}
-static void open_log()
+static void
+open_log(void)
{
char *conf_logdir;
- conf_logdir = getconf_str(CNF_LOGDIR);
- if (*conf_logdir == '/') {
- conf_logdir = stralloc(conf_logdir);
- } else {
- conf_logdir = stralloc2(config_dir, conf_logdir);
- }
+ /* now that we have a logfile, let the debug module know how to write
+ * error messages to it. This is due to some rather obscure linking
+ * problems. */
+ set_logerror(logerror);
+
+ conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfile = vstralloc(conf_logdir, "/log", NULL);
amfree(conf_logdir);
logfd = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0600);
if(logfd == -1) {
- error("could not open log file %s: %s", logfile, strerror(errno));
+ error(_("could not open log file %s: %s"), logfile, strerror(errno));
+ /*NOTREACHED*/
}
- if(amflock(logfd, "log") == -1)
- error("could not lock log file %s: %s", logfile, strerror(errno));
+ if(amflock(logfd, "log") == -1) {
+ error(_("could not lock log file %s: %s"), logfile, strerror(errno));
+ /*NOTREACHED*/
+ }
}
-static void close_log()
+static void
+close_log(void)
{
- if(amfunlock(logfd, "log") == -1)
- error("could not unlock log file %s: %s", logfile, strerror(errno));
+ if(amfunlock(logfd, "log") == -1) {
+ error(_("could not unlock log file %s: %s"), logfile, strerror(errno));
+ /*NOTREACHED*/
+ }
- if(close(logfd) == -1)
- error("close log file: %s", strerror(errno));
+ if(close(logfd) == -1) {
+ error(_("close log file: %s"), strerror(errno));
+ /*NOTREACHED*/
+ }
logfd = -1;
amfree(logfile);
}
-
-int get_logline(logf)
-FILE *logf;
+/* WARNING: Function accesses globals curstr, curlog, and curprog
+ * WARNING: Function has static member logline, returned via globals */
+int
+get_logline(
+ FILE * logf)
{
static char *logline = NULL;
char *logstr, *progstr;
int ch;
amfree(logline);
- if((logline = agets(logf)) == NULL) return 0;
+ while ((logline = agets(logf)) != NULL) {
+ if (logline[0] != '\0')
+ break;
+ amfree(logline);
+ }
+ if (logline == NULL) return 0;
curlinenum++;
s = logline;
ch = *s++;
projects / debian / amanda / blobdiff